Update to upstream version 2.2

.gitignore

@@ -1,2 +1,3 @@
 /maven-dependency-tree-2.0-source-release.zip
 /maven-dependency-tree-2.1-source-release.zip
+/maven-dependency-tree-2.2-source-release.zip

0001-Port-to-Maven-3.1.0-and-Eclipse-Aether.patch

@@ -1,36 +1,37 @@
-From 4256b988f0b7dea637773ecaaa3db2087dacbfaf Mon Sep 17 00:00:00 2001
+From 84007b5d12c451ed52efa75ce3675181dc0c5077 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 24 Jul 2013 12:14:30 +0200
 Subject: [PATCH] Port to Maven 3.1.0 and Eclipse Aether
 
 ---
  pom.xml                                            | 19 +++-------------
- .../internal/Maven3DependencyGraphBuilder.java     | 13 ++++++-----
+ .../internal/Maven3DependencyGraphBuilder.java     | 17 +++++++-------
  .../tree/DefaultDependencyTreeBuilder.java         |  6 +----
  .../tree/DependencyTreeResolutionListener.java     |  9 ++++++++
  .../tree/ArtifactMetadataSourceStub.java           | 26 +++++++++++++++++++---
- 5 files changed, 43 insertions(+), 30 deletions(-)
+ 5 files changed, 45 insertions(+), 32 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 9ccef69..5d4fe78 100644
+index 46a1d14..c739698 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -50,7 +50,7 @@
    </distributionManagement>
  
    <properties>
--    <mavenVersion>2.2.0</mavenVersion>
+-    <mavenVersion>2.2.1</mavenVersion>
 +    <mavenVersion>3.1.1</mavenVersion>
-     <maven.site.path>shared-archives/maven-dependency-tree-LATEST</maven.site.path>
    </properties>
  
-@@ -63,13 +63,13 @@
+   <contributors>
+@@ -62,14 +62,14 @@
    <dependencies>
      <dependency>
        <groupId>org.apache.maven</groupId>
 -      <artifactId>maven-project</artifactId>
 +      <artifactId>maven-compat</artifactId>
        <version>${mavenVersion}</version>
+       <scope>provided</scope>
      </dependency>
      <dependency>
        <groupId>org.apache.maven</groupId>
@@ -69,21 +70,39 @@ index 9ccef69..5d4fe78 100644
  
      <dependency>
 diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
-index b6f49e7..6254021 100644
+index f47363a..16e460a 100644
 --- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
 +++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
-@@ -40,8 +40,8 @@ import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
+@@ -36,8 +36,8 @@ import org.apache.maven.shared.dependency.graph.DependencyNode;
- import org.apache.maven.shared.dependency.graph.DependencyNode;
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.annotations.Requirement;
+ import org.codehaus.plexus.logging.AbstractLogEnabled;
 -import org.sonatype.aether.graph.Dependency;
 -import org.sonatype.aether.version.VersionConstraint;
 +import org.eclipse.aether.graph.Dependency;
 +import org.eclipse.aether.version.VersionConstraint;
  
- /**
+ import java.util.ArrayList;
-  * Wrapper around Maven 3 dependency resolver.
+ import java.util.Collection;
-@@ -101,7 +101,7 @@ public class Maven3DependencyGraphBuilder
+@@ -144,7 +144,7 @@ public class Maven3DependencyGraphBuilder
+         return result;
+     }
+ 
+-    private List<org.sonatype.aether.graph.Dependency> getReactorDependencies( Collection<MavenProject> reactorProjects,
++    private List<org.eclipse.aether.graph.Dependency> getReactorDependencies( Collection<MavenProject> reactorProjects,
+                                                                                List<?> dependencies )
+     {
+         Set<ArtifactKey> reactorProjectsIds = new HashSet<ArtifactKey>();
+@@ -157,7 +157,7 @@ public class Maven3DependencyGraphBuilder
+         for ( Object untypedDependency : dependencies )
+         {
+             Dependency dependency = (Dependency) untypedDependency;
+-            org.sonatype.aether.artifact.Artifact depArtifact = dependency.getArtifact();
++            org.eclipse.aether.artifact.Artifact depArtifact = dependency.getArtifact();
+ 
+             ArtifactKey key =
+                 new ArtifactKey( depArtifact.getGroupId(), depArtifact.getArtifactId(), depArtifact.getVersion() );
+@@ -173,7 +173,7 @@ public class Maven3DependencyGraphBuilder
  
      private Artifact getDependencyArtifact( Dependency dep )
      {
@@ -92,7 +111,7 @@ index b6f49e7..6254021 100644
  
          return factory.createDependencyArtifact( artifact.getGroupId(), artifact.getArtifactId(),
                                                   VersionRange.createFromVersion( artifact.getVersion() ),
-@@ -109,7 +109,7 @@ public class Maven3DependencyGraphBuilder
+@@ -181,7 +181,7 @@ public class Maven3DependencyGraphBuilder
                                                   artifact.getClassifier(), dep.getScope(), dep.isOptional() );
      }
  
@@ -101,7 +120,7 @@ index b6f49e7..6254021 100644
                                                  Artifact artifact, ArtifactFilter filter )
      {
          DefaultDependencyNode current =
-@@ -117,7 +117,7 @@ public class Maven3DependencyGraphBuilder
+@@ -191,7 +191,7 @@ public class Maven3DependencyGraphBuilder
                                         getVersionSelectedFromRange( node.getVersionConstraint() ) );
  
          List<DependencyNode> nodes = new ArrayList<DependencyNode>( node.getChildren().size() );
@@ -110,7 +129,7 @@ index b6f49e7..6254021 100644
          {
              Artifact childArtifact = getDependencyArtifact( child.getDependency() );
  
-@@ -140,7 +140,8 @@ public class Maven3DependencyGraphBuilder
+@@ -214,7 +214,8 @@ public class Maven3DependencyGraphBuilder
          }
  
          StringBuilder sb = new StringBuilder();
@@ -121,7 +140,7 @@ index b6f49e7..6254021 100644
              if ( sb.length() > 0 )
              {
 diff --git a/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java b/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
-index 60f8c92..3c3cae2 100644
+index 063406d..3c90b5b 100644
 --- a/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
 +++ b/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
 @@ -122,10 +122,6 @@ public class DefaultDependencyTreeBuilder
@@ -135,7 +154,7 @@ index 60f8c92..3c3cae2 100644
          catch ( InvalidDependencyVersionException e )
          {
              throw new DependencyTreeBuilderException( "Invalid dependency version for artifact "
-@@ -136,7 +132,7 @@ public class DefaultDependencyTreeBuilder
+@@ -143,7 +139,7 @@ public class DefaultDependencyTreeBuilder
      public DependencyNode buildDependencyTree( MavenProject project )
          throws DependencyTreeBuilderException
      {
@@ -145,10 +164,10 @@ index 60f8c92..3c3cae2 100644
      }
  
 diff --git a/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java b/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
-index 058e59e..b4c4b21 100644
+index d646eac..0f8f577 100644
 --- a/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
 +++ b/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
-@@ -363,6 +363,15 @@ public class DependencyTreeResolutionListener
+@@ -362,6 +362,15 @@ public class DependencyTreeResolutionListener
          }
      }
  
@@ -165,7 +184,7 @@ index 058e59e..b4c4b21 100644
  
      /**
 diff --git a/src/test/java/org/apache/maven/shared/dependency/tree/ArtifactMetadataSourceStub.java b/src/test/java/org/apache/maven/shared/dependency/tree/ArtifactMetadataSourceStub.java
-index 1a3aa13..16627ca 100644
+index e2e69d5..c368880 100644
 --- a/src/test/java/org/apache/maven/shared/dependency/tree/ArtifactMetadataSourceStub.java
 +++ b/src/test/java/org/apache/maven/shared/dependency/tree/ArtifactMetadataSourceStub.java
 @@ -31,6 +31,7 @@ import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -194,7 +213,7 @@ index 1a3aa13..16627ca 100644
          throws ArtifactMetadataRetrievalException
      {
          List<ArtifactVersion> availableVersions = availableVersionsByArtifact.get( artifact );
-@@ -128,9 +129,28 @@ public class ArtifactMetadataSourceStub
+@@ -124,9 +125,28 @@ public class ArtifactMetadataSourceStub
      }
  
      public Artifact retrieveRelocatedArtifact( Artifact artifact, ArtifactRepository localRepository,
@@ -225,5 +244,5 @@ index 1a3aa13..16627ca 100644
 +    }
  }
 -- 
-1.8.4.2
+1.9.3
 

maven-dependency-tree.spec

@@ -1,7 +1,7 @@
 
 Name:          maven-dependency-tree
-Version:       2.1
+Version:       2.2
-Release:       8%{?dist}
+Release:       1%{?dist}
 Summary:       Maven dependency tree artifact
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -39,6 +39,8 @@ This package contains javadoc for %{name}.
 %setup -q
 %patch0001 -p1
 
+%pom_remove_plugin :apache-rat-plugin
+
 %build
 # Incompatible version of jMock (Fedora has 2.x, upstream uses 1.x)
 %mvn_build -f
@@ -54,6 +56,9 @@ This package contains javadoc for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Sep 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-1
+- Update to upstream version 2.2
+
 * Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1-8
 - Fix build-requires on parent POM
 

sources

@@ -1 +1 @@
-1d2f141c934ea06b56e58d6b54f3560b  maven-dependency-tree-2.1-source-release.zip
+13e53c7ac250655d5f5a75b24aec6005  maven-dependency-tree-2.2-source-release.zip