mirror of https://github.com/apache/maven.git
[MNG-6176] Fix javadoc *errors* in maven-compat
This commit is contained in:
Stephen Connolly
parent
52eecc406f
commit
b12905ce02
|
|
@ -132,26 +132,4 @@ under the License.
|
|||
</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>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ package org.apache.maven.artifact;
|
|||
*/
|
||||
|
||||
/**
|
||||
* Type safe reincarnation of Artifact scope. Also supplies the <code>DEFAULT_SCOPE<code> as well
|
||||
* Type safe reincarnation of Artifact scope. Also supplies the {@code DEFAULT_SCOPE} as well
|
||||
* as convenience method to deal with scope relationships.
|
||||
*
|
||||
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.apache.maven.artifact.Artifact;
|
|||
|
||||
/**
|
||||
* Do not use!
|
||||
* <p/>
|
||||
* <p>
|
||||
* Should only be implemented by DebugResolutionListener. Remove this
|
||||
* when the ResolutionListener interface deprecation of the manageArtifact
|
||||
* method (and the [yet to be done] addition of these methods to that
|
||||
|
|
@ -40,4 +40,4 @@ public interface ResolutionListenerForDepMgmt
|
|||
|
||||
void manageArtifactSystemPath( Artifact artifact,
|
||||
Artifact replacement );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,15 +40,16 @@ public final class ModelUtils
|
|||
|
||||
/**
|
||||
* This should be the resulting ordering of plugins after merging:
|
||||
* <p/>
|
||||
* <p>
|
||||
* Given:
|
||||
* <p/>
|
||||
* parent: X -> A -> B -> D -> E
|
||||
* child: Y -> A -> C -> D -> F
|
||||
* <p/>
|
||||
* <pre>
|
||||
* parent: X -> A -> B -> D -> E
|
||||
* child: Y -> A -> C -> D -> F
|
||||
* </pre>
|
||||
* Result:
|
||||
* <p/>
|
||||
* X -> Y -> A -> B -> C -> D -> E -> F
|
||||
* <pre>
|
||||
* X -> Y -> A -> B -> C -> D -> E -> F
|
||||
* </pre>
|
||||
*/
|
||||
public static void mergePluginLists( PluginContainer childContainer, PluginContainer parentContainer,
|
||||
boolean handleAsInheritance )
|
||||
|
|
|
|||
|
|
@ -103,10 +103,6 @@ public abstract class AbstractStringBasedModelInterpolator
|
|||
this.pathTranslator = pathTranslator;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO Remove the throws clause.
|
||||
* @throws IOException This exception is not thrown any more, and needs to be removed.
|
||||
*/
|
||||
protected AbstractStringBasedModelInterpolator()
|
||||
{
|
||||
}
|
||||
|
|
@ -120,7 +116,7 @@ public abstract class AbstractStringBasedModelInterpolator
|
|||
/**
|
||||
* Serialize the inbound Model instance to a StringWriter, perform the regex replacement to resolve
|
||||
* POM expressions, then re-parse into the resolved Model instance.
|
||||
* <br/>
|
||||
* <p>
|
||||
* <b>NOTE:</b> This will result in a different instance of Model being returned!!!
|
||||
*
|
||||
* @param model The inbound Model instance, to serialize and reference for expression resolution
|
||||
|
|
@ -189,7 +185,7 @@ public abstract class AbstractStringBasedModelInterpolator
|
|||
* <li>If the value is null, but the context contains the expression, don't replace the expression string
|
||||
* with the value, and continue to find other expressions.</li>
|
||||
* <li>If the value is null, get it from the model properties.</li>
|
||||
* <li>
|
||||
* </ul>
|
||||
*/
|
||||
public String interpolate( String src,
|
||||
Model model,
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ package org.apache.maven.project.interpolation;
|
|||
|
||||
/**
|
||||
* @author jdcasey
|
||||
* <p/>
|
||||
* Created on Feb 2, 2005
|
||||
*/
|
||||
@SuppressWarnings( "serial" )
|
||||
@Deprecated
|
||||
|
|
@ -69,4 +67,4 @@ public class ModelInterpolationException
|
|||
return originalMessage;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@ import java.util.Map;
|
|||
|
||||
/**
|
||||
* @author jdcasey
|
||||
* <p/>
|
||||
* Created on Feb 2, 2005
|
||||
*/
|
||||
@Deprecated
|
||||
public interface ModelInterpolator
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ public class MetadataResolutionResult
|
|||
/**
|
||||
* TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
|
||||
* {@link #getVersionRangeViolation(int)} but it's not used like that in
|
||||
* {@link DefaultLegacyArtifactCollector}
|
||||
* {@link org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector}
|
||||
*/
|
||||
public MetadataResolutionResult addVersionRangeViolation( Exception e )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ public class MetadataGraph
|
|||
* construct graph from a "dirty" tree
|
||||
*
|
||||
* @param tree "dirty" tree root
|
||||
* @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
|
||||
* @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
|
||||
* @param scopedVertices true if graph nodes should be versioned and scoped
|
||||
* (different versions and/or scopes -> different nodes)
|
||||
* (different versions and/or scopes -> different nodes)
|
||||
*
|
||||
*/
|
||||
public MetadataGraph( MetadataTreeNode tree, boolean versionedVertices, boolean scopedVertices )
|
||||
|
|
|
|||
|
|
@ -94,15 +94,19 @@ public class ModelUtilsTest
|
|||
|
||||
/**
|
||||
* Test that this is the resulting ordering of plugins after merging:
|
||||
*
|
||||
* <p>
|
||||
* Given:
|
||||
*
|
||||
* parent: X -> A -> B -> D -> E
|
||||
* child: Y -> A -> C -> D -> F
|
||||
*
|
||||
* </p>
|
||||
* <pre>
|
||||
* parent: X -> A -> B -> D -> E
|
||||
* child: Y -> A -> C -> D -> F
|
||||
* </pre>
|
||||
* <p>
|
||||
* Result:
|
||||
*
|
||||
* X -> Y -> A -> B -> C -> D -> E -> F
|
||||
* </p>
|
||||
* <pre>
|
||||
* X -> Y -> A -> B -> C -> D -> E -> F
|
||||
* </pre>
|
||||
*/
|
||||
public void testShouldPreserveChildOrderingOfPluginsAfterParentMerge()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,14 +47,14 @@ public class ProjectInheritanceTest
|
|||
/**
|
||||
* How the test project is set up:
|
||||
*
|
||||
* 1. dependencyManagement lists dependencies on a & b,
|
||||
* 1. dependencyManagement lists dependencies on a & b,
|
||||
* with an exclusion on c in b.
|
||||
* 2. the child project lists a dependency on project a only
|
||||
* 3. a depends on b (which is transitive to the child project),
|
||||
* and b depends on c.
|
||||
*
|
||||
* We should see that the resulting size of collected artifacts is two:
|
||||
* a & b only.
|
||||
* a & b only.
|
||||
*/
|
||||
public void testDependencyManagementExclusionsExcludeTransitively()
|
||||
throws Exception
|
||||
|
|
@ -87,7 +87,7 @@ public class ProjectInheritanceTest
|
|||
* now depends upon d, which has a transitive dependency on c. Even though
|
||||
* we did list an exclusion on c, it was only from within the context of
|
||||
* project b. We will pick up project c in this case because no
|
||||
* restrictions were placed on d. This demonstrates that a, b, c, & d will
|
||||
* restrictions were placed on d. This demonstrates that a, b, c, & d will
|
||||
* all be collected.
|
||||
*
|
||||
* @throws Exception
|
||||
|
|
@ -116,4 +116,4 @@ public class ProjectInheritanceTest
|
|||
assertTrue( "maven-test:t09-c is not in the project", map.containsKey( "maven-test:t09-c" ) );
|
||||
assertTrue( "maven-test:t09-d is not in the project", map.containsKey( "maven-test:t09-d" ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import org.apache.maven.model.Repository;
|
|||
import org.apache.maven.model.RepositoryPolicy;
|
||||
import org.apache.maven.plugin.LegacySupport;
|
||||
import org.apache.maven.repository.RepositorySystem;
|
||||
import org.apache.maven.repository.legacy.LegacyRepositorySystem;
|
||||
import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.codehaus.plexus.PlexusConstants;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public class FarthestConflictResolverTest
|
|||
* Tests that <code>a:2.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* a:1.0
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* </pre>
|
||||
*/
|
||||
public void testDepth()
|
||||
|
|
@ -59,7 +59,7 @@ public class FarthestConflictResolverTest
|
|||
/**
|
||||
* Tests that <code>a:2.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* a:1.0
|
||||
* </pre>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public class NearestConflictResolverTest
|
|||
* Tests that <code>a:1.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* a:1.0
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* </pre>
|
||||
*/
|
||||
public void testDepth()
|
||||
|
|
@ -59,7 +59,7 @@ public class NearestConflictResolverTest
|
|||
/**
|
||||
* Tests that <code>a:1.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* a:1.0
|
||||
* </pre>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public class NewestConflictResolverTest
|
|||
* Tests that <code>a:2.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* a:1.0
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* </pre>
|
||||
*/
|
||||
public void testDepth()
|
||||
|
|
@ -59,7 +59,7 @@ public class NewestConflictResolverTest
|
|||
/**
|
||||
* Tests that <code>a:2.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* a:1.0
|
||||
* </pre>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public class OldestConflictResolverTest
|
|||
* Tests that <code>a:1.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* a:1.0
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* </pre>
|
||||
*/
|
||||
public void testDepth()
|
||||
|
|
@ -60,7 +60,7 @@ public class OldestConflictResolverTest
|
|||
/**
|
||||
* Tests that <code>a:1.0</code> wins in the scenario:
|
||||
* <pre>
|
||||
* b:1.0 -> a:2.0
|
||||
* b:1.0 -> a:2.0
|
||||
* a:1.0
|
||||
* </pre>
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue