mirror of https://github.com/apache/maven.git
[MNG-6176] Javadoc errors prevent release with Java 8
Upgrade to modello-1.9.1 Fix javadoc errors in tests
This commit is contained in:
rfscholte
parent
da03d6b031
commit
0e7e3eeb59
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
|
|||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* @author Karl Heinz Marbaise <khmarbaise@apache.org>
|
||||
* @author Karl Heinz Marbaise
|
||||
*/
|
||||
public class CleanArgumentTest
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
6
pom.xml
6
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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue