Updated to version 2.4

.gitignore

@@ -1,3 +1,4 @@
 maven-dependency-plugin-2.2.tar.xz
 /maven-dependency-plugin-2.2-source-release.zip
 /maven-dependency-plugin-2.3-source-release.zip
+/maven-dependency-plugin-2.4-source-release.zip

maven-dependency-plugin-commons-io.patch

@@ -0,0 +1,17 @@
+diff --git a/pom.xml b/pom.xml
+index c3d92dc..bd58801 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -206,6 +206,12 @@ under the License.
+     </dependency>
+ 
+     <dependency>
++      <groupId>org.apache.commons</groupId>
++      <artifactId>commons-io</artifactId>
++      <version>3.2.1</version>
++    </dependency>
++
++    <dependency>
+       <groupId>commons-collections</groupId>
+       <artifactId>commons-collections</artifactId>
+       <version>3.2.1</version>

maven-dependency-plugin-core.patch

@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index bd58801..1a3f62f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -92,6 +92,11 @@ under the License.
+     <!-- maven -->
+     <dependency>
+       <groupId>org.apache.maven</groupId>
++      <artifactId>maven-core</artifactId>
++      <version>${mavenVersion}</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven</groupId>
+       <artifactId>maven-artifact</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>

maven-dependency-plugin-removed-exception-catching.patch

@@ -0,0 +1,15 @@
+diff --git a/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java b/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
+index cbc2520..eb8b1e6 100644
+--- a/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
++++ b/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
+@@ -137,10 +137,6 @@ public class ResolvePluginsMojo
+         {
+             throw new MojoExecutionException( "Nested:", e );
+         }
+-        catch ( InvalidDependencyVersionException e )
+-        {
+-            throw new MojoExecutionException( "Nested:", e );
+-        }
+         finally
+         {
+             IOUtil.close( outputWriter );

maven-dependency-plugin-removed-test.patch

@@ -0,0 +1,24 @@
+diff --git a/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java b/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
+index 182cd28..a7078a1 100644
+--- a/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
++++ b/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
+@@ -24,7 +24,6 @@ import java.io.File;
+ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+ import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+-import org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout;
+ import org.apache.maven.plugin.MojoFailureException;
+ import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
+ 
+@@ -101,11 +100,6 @@ public class TestGetMojo
+         assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
+         assertEquals( "http://repo1.maven.apache.org/maven2", repo.getUrl() );
+ 
+-        repo = mojo.parseRepository( "central::legacy::http://repo1.maven.apache.org/maven2", policy );
+-        assertEquals( "central", repo.getId() );
+-        assertEquals( LegacyRepositoryLayout.class, repo.getLayout().getClass() );
+-        assertEquals( "http://repo1.maven.apache.org/maven2", repo.getUrl() );
+-
+         repo = mojo.parseRepository( "central::::http://repo1.maven.apache.org/maven2", policy );
+         assertEquals( "central", repo.getId() );
+         assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );

maven-dependency-plugin.spec

@@ -1,6 +1,6 @@
 Name:           maven-dependency-plugin
-Version:        2.3
-Release:        3%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        Plugin to manipulate, copy and unpack local and remote artifacts
 
 Group:          Development/Libraries
@@ -8,6 +8,15 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/%{name}
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Patch0:         0001-Add-setThreshold-stub.patch
+# Added apache-commons-io dep
+Patch1:         %{name}-commons-io.patch
+# Added maven-core dep
+Patch2:         %{name}-core.patch
+# Removed a test because it was using a legacy class
+Patch3:         %{name}-removed-test.patch
+# Removed exception catching as it has already been done
+# (not upstreamable)
+Patch4:         %{name}-removed-exception-catching.patch
 
 BuildArch:      noarch
 
@@ -15,6 +24,7 @@ BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
 BuildRequires: ant
 BuildRequires: asm2
+BuildRequires: apache-commons-io
 BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
@@ -63,6 +73,10 @@ Requires:       jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 sed -i \
     's:org.codehaus.classworlds.ClassRealm:org.codehaus.plexus.classworlds.realm.ClassRealm:' \
@@ -95,6 +109,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Feb 21 2012 Tomas Radej <tradej@redhat.com> - 2.4-1
+- Updated to the upstream version
+- Partially removed a test because of a legacy class use
+- Removed exception checking as it has already been done
+
 * Fri Jan 13 2012 Alexander Kurtakov <akurtako@redhat.com> 2.3-3
 - Add missing BR.
 

sources

@@ -1 +1 @@
-c21a7404356997fef2de3bdbd4ba0272  maven-dependency-plugin-2.3-source-release.zip
+fd10e0fc8bb53de6caf0d8f39e948d0b  maven-dependency-plugin-2.4-source-release.zip