[MNG-6176] Javadoc errors prevent release with Java 8 Upgrade to modello-1.9.1 Fix javadoc errors in tests
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0e7e3eeb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0e7e3eeb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0e7e3eeb Branch: refs/heads/mvn-3.5.1/MNG-6174 Commit: 0e7e3eeb597b92f1394b24e33d5933e995ee8104 Parents: da03d6b Author: rfscholte <rfscho...@apache.org> Authored: Sat Mar 18 12:35:18 2017 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Sat Mar 18 12:55:05 2017 +0100 ---------------------------------------------------------------------- .../versioning/ComparableVersionTest.java | 2 +- maven-compat/pom.xml | 35 +++++++++++++------- .../LifecycleExecutionPlanCalculatorTest.java | 2 +- .../LifecycleExecutionPlanCalculatorStub.java | 2 +- .../stub/ProjectDependencyGraphStub.java | 5 +-- .../org/apache/maven/cli/CleanArgumentTest.java | 2 +- .../DefaultInheritanceAssemblerTest.java | 2 +- .../AbstractModelInterpolatorTest.java | 2 +- pom.xml | 6 +++- 9 files changed, 37 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index aea98dd..875b43e 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -185,7 +185,7 @@ public class ComparableVersionTest /** * Test <a href="https://issues.apache.org/jira/browse/MNG-5568";>MNG-5568</a> edge case - * which was showing transitive inconsistency: since A > B and B > C then we should have A > C + * which was showing transitive inconsistency: since A > B and B > C then we should have A > C * otherwise sorting a list of ComparableVersions() will in some cases throw runtime exception; * see Netbeans issues <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=240845";>240845</a> and * <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=226100";>226100</a> http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2d0ecad..7af138d 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -113,18 +113,6 @@ under the License. </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <!-- There's no maintenance on maven-compat --> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -143,4 +131,27 @@ under the License. </plugin> </plugins> </build> + + <profiles> + <profile> + <id>javadoc8</id> + <activation> + <jdk>!1.7</jdk> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <!-- There's no maintenance on maven-compat --> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java index a9af566..0e1c3c7 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java @@ -25,7 +25,7 @@ import org.apache.maven.lifecycle.internal.stub.PluginVersionResolverStub; import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub; /** - * @author Kristian Rosenvold> + * @author Kristian Rosenvold */ public class LifecycleExecutionPlanCalculatorTest extends AbstractCoreMavenComponentTestCase http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java index 43aa47c..90de4d8 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java @@ -88,7 +88,7 @@ public class LifecycleExecutionPlanCalculatorStub public final static MojoDescriptor SITE_DEPLOY = createMojoDescriptor( "site-deploy" ); /** - * @deprecated instead use {@link #getNumberOfExecutions()} + * @deprecated instead use {@link #getNumberOfExecutions(ProjectBuildList)} */ @Deprecated public int getNumberOfExceutions( ProjectBuildList projectBuildList ) http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java index 7af756d..8df5055 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java @@ -42,14 +42,15 @@ import java.util.List; /** * A stub dependency graph that is custom made for testing concurrent build graph evaluations. - * <p/> + * <p> * Implements a graph as follows: * A has no dependencies * B depends on A * C depends on A - * X depends on B & C + * X depends on B & C * Y depends on B * Z depends on C + * </p> * * @author Kristian Rosenvold */ http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java index 874170e..7e2b489 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; /** - * @author Karl Heinz Marbaise <khmarba...@apache.org> + * @author Karl Heinz Marbaise */ public class CleanArgumentTest { http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java index 1b47ec1..372d0a9 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java @@ -89,7 +89,7 @@ public class DefaultInheritanceAssemblerTest } /** - * Flat directory structure: parent & child POMs in sibling directories, child directory == artifactId. + * Flat directory structure: parent & child POMs in sibling directories, child directory == artifactId. * @throws Exception */ public void testFlatUrls() http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java index d8b54b8..aa09cb0 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java @@ -68,7 +68,7 @@ public abstract class AbstractModelInterpolatorTest } /** - * @deprecated instead use {@link #assertCollectorState()} + * @deprecated instead use {@link #assertCollectorState(int, int, int, SimpleProblemCollector)} */ @Deprecated protected void assertColllectorState( int numFatals, int numErrors, int numWarnings, http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d2b4633..44c361a 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ under the License. <wagonVersion>2.12</wagonVersion> <securityDispatcherVersion>1.4</securityDispatcherVersion> <cipherVersion>1.7</cipherVersion> - <modelloVersion>1.9.0</modelloVersion> + <modelloVersion>1.9.1</modelloVersion> <jxpathVersion>1.3</jxpathVersion> <resolverVersion>1.0.3</resolverVersion> <slf4jVersion>1.7.22</slf4jVersion> @@ -650,6 +650,10 @@ under the License. <reports> <report>aggregate</report> </reports> + <configuration> + <!-- There's no maintenance on maven-compat --> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> </reportSet> </reportSets> </plugin>
