maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1684260 - in /maven/shared/trunk/maven-dependency-tree: ./ src/main/java/org/apache/maven/shared/dependency/graph/filter/ src/main/java/org/apache/maven/shared/dependency/graph/internal/ src/main/java/org/apache/maven/shared/dependency/gra...
Date Mon, 08 Jun 2015 19:57:54 GMT
Author: rfscholte
Date: Mon Jun  8 19:57:54 2015
New Revision: 1684260

URL: http://svn.apache.org/r1684260
Log:
MSHARED-421: Change JDK + Maven requirements

Modified:
    maven/shared/trunk/maven-dependency-tree/pom.xml
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AncestorOrSelfDependencyNodeFilter.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AndDependencyNodeFilter.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/ArtifactDependencyNodeFilter.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyGraphBuilder.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/BuildingDependencyNodeVisitor.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/CollectingDependencyNodeVisitor.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/SerializingDependencyNodeVisitor.java

Modified: maven/shared/trunk/maven-dependency-tree/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/pom.xml Mon Jun  8 19:57:54 2015
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>maven-dependency-tree</artifactId>
-  <version>2.3-SNAPSHOT</version>
+  <version>3.0-SNAPSHOT</version>
 
   <name>Apache Maven Dependency Tree</name>
   <description>A tree-based API for resolution of Maven project dependencies</description>
@@ -50,7 +50,9 @@
   </distributionManagement>
 
   <properties>
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenVersion>3.0</mavenVersion>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
   </properties>
 
   <contributors>
@@ -62,12 +64,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>3.0.4</version>
       <scope>provided</scope>
@@ -206,13 +202,9 @@
             <configuration>
               <groups>
                 <group>
-                  <title>Maven 2 &amp; 3 Dependency Graph</title>
+                  <title>Maven 3 Dependency Graph</title>
                   <packages>org.apache.maven.shared.dependency.graph*</packages>
                 </group>
-                <group>
-                  <title>Maven 2-specific Dependency Tree</title>
-                  <packages>org.apache.maven.shared.dependency.tree*</packages>
-                </group>
               </groups>
             </configuration>
           </plugin>

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AncestorOrSelfDependencyNodeFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AncestorOrSelfDependencyNodeFilter.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AncestorOrSelfDependencyNodeFilter.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AncestorOrSelfDependencyNodeFilter.java
Mon Jun  8 19:57:54 2015
@@ -64,6 +64,7 @@ public class AncestorOrSelfDependencyNod
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean accept( DependencyNode node )
     {
         for ( DependencyNode descendantNode : descendantNodes )

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AndDependencyNodeFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AndDependencyNodeFilter.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AndDependencyNodeFilter.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/AndDependencyNodeFilter.java
Mon Jun  8 19:57:54 2015
@@ -70,6 +70,7 @@ public class AndDependencyNodeFilter
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean accept( DependencyNode node )
     {
         for ( DependencyNodeFilter filter : filters )

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/ArtifactDependencyNodeFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/ArtifactDependencyNodeFilter.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/ArtifactDependencyNodeFilter.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/filter/ArtifactDependencyNodeFilter.java
Mon Jun  8 19:57:54 2015
@@ -57,6 +57,7 @@ public class ArtifactDependencyNodeFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean accept( DependencyNode node )
     {
         Artifact artifact = node.getArtifact();

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyGraphBuilder.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyGraphBuilder.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyGraphBuilder.java
Mon Jun  8 19:57:54 2015
@@ -59,6 +59,7 @@ public class DefaultDependencyGraphBuild
      * @return DependencyNode containing the dependency graph.
      * @throws DependencyGraphBuilderException if some of the dependencies could not be resolved.
      */
+    @Override
     public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter
)
         throws DependencyGraphBuilderException
     {
@@ -74,6 +75,7 @@ public class DefaultDependencyGraphBuild
      * @return DependencyNode containing the dependency graph.
      * @throws DependencyGraphBuilderException if some of the dependencies could not be resolved.
      */
+    @Override
     public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter,
                                                 Collection<MavenProject> reactorProjects
)
         throws DependencyGraphBuilderException
@@ -131,6 +133,7 @@ public class DefaultDependencyGraphBuild
      * @param context   Plexus context to inject.
      * @throws ContextException if the PlexusContainer could not be located.
      */
+    @Override
     public void contextualize( Context context )
         throws ContextException
     {

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
Mon Jun  8 19:57:54 2015
@@ -68,6 +68,7 @@ public class DefaultDependencyNode imple
      * @return the visitor result of ending the visit to this node
      * @since 1.1
      */
+    @Override
     public boolean accept( DependencyNodeVisitor visitor )
     {
         if ( visitor.visit( this ) )
@@ -87,6 +88,7 @@ public class DefaultDependencyNode imple
     /**
      * @return Artifact for this DependencyNode.
      */
+    @Override
     public Artifact getArtifact()
     {
         return artifact;
@@ -104,6 +106,7 @@ public class DefaultDependencyNode imple
     /**
      * @return List of child nodes for this DependencyNode.
      */
+    @Override
     public List<DependencyNode> getChildren()
     {
         return children;
@@ -112,21 +115,25 @@ public class DefaultDependencyNode imple
     /**
      * @return Parent of this DependencyNode.
      */
+    @Override
     public DependencyNode getParent()
     {
         return parent;
     }
 
+    @Override
     public String getPremanagedVersion()
     {
         return premanagedVersion;
     }
 
+    @Override
     public String getPremanagedScope()
     {
         return premanagedScope;
     }
 
+    @Override
     public String getVersionConstraint()
     {
         return versionConstraint;
@@ -135,6 +142,7 @@ public class DefaultDependencyNode imple
     /**
      * @return Stringified representation of this DependencyNode.
      */
+    @Override
     public String toNodeString()
     {
         StringBuffer buffer = new StringBuffer();

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
Mon Jun  8 19:57:54 2015
@@ -73,6 +73,7 @@ public class Maven31DependencyGraphBuild
      * @return DependencyNode containing the dependency graph.
      * @throws DependencyGraphBuilderException if some of the dependencies could not be resolved.
      */
+    @Override
     public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter
)
         throws DependencyGraphBuilderException
     {
@@ -89,6 +90,7 @@ public class Maven31DependencyGraphBuild
      * @return DependencyNode containing the dependency graph.
      * @throws DependencyGraphBuilderException if some of the dependencies could not be resolved.
      */
+    @Override
     public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter,
                                                 Collection<MavenProject> reactorProjects
)
         throws DependencyGraphBuilderException

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
Mon Jun  8 19:57:54 2015
@@ -72,6 +72,7 @@ public class Maven3DependencyGraphBuilde
      * @return DependencyNode containing the dependency graph.
      * @throws DependencyGraphBuilderException if some of the dependencies could not be resolved.
      */
+    @Override
     public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter
)
         throws DependencyGraphBuilderException
     {
@@ -88,6 +89,7 @@ public class Maven3DependencyGraphBuilde
      * @return DependencyNode containing the dependency graph.
      * @throws DependencyGraphBuilderException if some of the dependencies could not be resolved.
      */
+    @Override
     public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter,
                                                 Collection<MavenProject> reactorProjects
)
         throws DependencyGraphBuilderException

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/BuildingDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/BuildingDependencyNodeVisitor.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/BuildingDependencyNodeVisitor.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/BuildingDependencyNodeVisitor.java
Mon Jun  8 19:57:54 2015
@@ -80,6 +80,7 @@ public class BuildingDependencyNodeVisit
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean visit( DependencyNode node )
     {
         // clone the node
@@ -107,6 +108,7 @@ public class BuildingDependencyNodeVisit
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean endVisit( DependencyNode node )
     {
         parentNodes.pop();

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/CollectingDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/CollectingDependencyNodeVisitor.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/CollectingDependencyNodeVisitor.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/CollectingDependencyNodeVisitor.java
Mon Jun  8 19:57:54 2015
@@ -57,6 +57,7 @@ public class CollectingDependencyNodeVis
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean visit( DependencyNode node )
     {
         // collect node
@@ -68,6 +69,7 @@ public class CollectingDependencyNodeVis
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean endVisit( DependencyNode node )
     {
         return true;

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
Mon Jun  8 19:57:54 2015
@@ -64,6 +64,7 @@ public class FilteringDependencyNodeVisi
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean visit( DependencyNode node )
     {
         boolean visit;
@@ -83,6 +84,7 @@ public class FilteringDependencyNodeVisi
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean endVisit( DependencyNode node )
     {
         boolean visit;

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/SerializingDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/SerializingDependencyNodeVisitor.java?rev=1684260&r1=1684259&r2=1684260&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/SerializingDependencyNodeVisitor.java
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/SerializingDependencyNodeVisitor.java
Mon Jun  8 19:57:54 2015
@@ -142,6 +142,7 @@ public class SerializingDependencyNodeVi
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean visit( DependencyNode node )
     {
         indent( node );
@@ -156,6 +157,7 @@ public class SerializingDependencyNodeVi
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean endVisit( DependencyNode node )
     {
         depth--;



Mime
View raw message