Update to upstream 3.0 snapshot (svn revision 1708080)

.gitignore

@@ -7,3 +7,4 @@ maven-dependency-plugin-2.2.tar.xz
 /maven-dependency-plugin-2.8-source-release.zip
 /maven-dependency-plugin-2.9-source-release.zip
 /maven-dependency-plugin-2.10-source-release.zip
+/maven-dependency-plugin-3.0-SNAPSHOT-source-release.zip

0001-Add-setThreshold-stub.patch

@@ -1,33 +0,0 @@
-From 052c1cafc64c7fa4a15e9a8f2dedfa9d5cdbf19a Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Mon, 25 Jul 2011 14:44:11 +0200
-Subject: [PATCH] Add setThreshold stub
-
-This is needed for proper working with our maven3-only stack
----
- .../dependency/utils/DependencySilentLog.java      |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
-index e8cba42..3b45f5e 100644
---- a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
-+++ b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
-@@ -324,4 +324,15 @@ public class DependencySilentLog
-     {
-         return null;
-     }
-+
-+    /**
-+     * By default, do nothing.
-+     *
-+     * @see org.codehaus.plexus.logging.Logger#setThreshold(int)
-+     */
-+    public void setThreshold(int level)
-+    {
-+        // nop
-+    }
-+
- }
--- 
-1.7.6
-

maven-dependency-plugin-commons-io.patch

@@ -1,17 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,27 +0,0 @@
-From a9316856e6c53eba9f444c85dfdfeff6d0f0f5b7 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb@redhat.com>
-Date: Fri, 15 Mar 2013 13:53:16 +0100
-Subject: [PATCH] removed exception catching
-
----
- .../apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java  | 4 ----
- 1 file changed, 4 deletions(-)
-
-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 bc509dd..476f520 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
-@@ -143,10 +143,6 @@ public class ResolvePluginsMojo
-         {
-             throw new MojoExecutionException( "Nested:", e );
-         }
--        catch ( final InvalidDependencyVersionException e )
--        {
--            throw new MojoExecutionException( "Nested:", e );
--        }
-         catch ( final ArtifactFilterException e )
-         {
-             throw new MojoExecutionException( "Nested:", e );
--- 
-1.8.1.4
-

maven-dependency-plugin.spec

@@ -1,50 +1,45 @@
 Name:           maven-dependency-plugin
-Version:        2.10
+Version:        3.0
-Release:        2%{?dist}
+Release:        0.1.20151012svn1708080%{?dist}
 Summary:        Plugin to manipulate, copy and unpack local and remote artifacts
-
-Group:          Development/Libraries
 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 exception catching as it has already been done
-# (not upstreamable)
-Patch3:         %{name}-removed-exception-catching.patch
-
 BuildArch:      noarch
 
+# svn export -r 1707940 http://svn.apache.org/viewvc/maven/plugins/trunk
+# mvn -f trunk/maven-dependency-plugin -P apache-release package
+# cp trunk/maven-dependency-plugin/target/maven-dependency-plugin-3.0-SNAPSHOT-source-release.zip .
+Source0:        %{name}-%{version}-SNAPSHOT-source-release.zip
+#Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
 BuildRequires:  maven-local
+BuildRequires:  mvn(classworlds:classworlds)
 BuildRequires:  mvn(commons-collections:commons-collections)
+BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(commons-lang:commons-lang)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.commons:commons-io)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
 BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-tools)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
 BuildRequires:  mvn(org.apache.maven.shared:file-management)
+BuildRequires:  mvn(org.apache.maven.shared:maven-artifact-transfer)
 BuildRequires:  mvn(org.apache.maven.shared:maven-common-artifact-filters)
-BuildRequires:  mvn(org.apache.maven.shared:maven-dependency-analyzer) >= 1.4
+BuildRequires:  mvn(org.apache.maven.shared:maven-dependency-analyzer)
 BuildRequires:  mvn(org.apache.maven.shared:maven-dependency-tree)
 BuildRequires:  mvn(org.apache.maven.shared:maven-invoker)
-BuildRequires:  mvn(org.apache.maven.shared:maven-plugin-testing-harness)
+BuildRequires:  mvn(org.apache.maven.wagon:wagon-http-lightweight)
-BuildRequires:  mvn(org.apache.maven:maven-artifact)
-BuildRequires:  mvn(org.apache.maven:maven-artifact-manager)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-model)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven:maven-project)
-BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-io)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
@@ -64,28 +59,30 @@ Summary:        API documentation for %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-SNAPSHOT
 
-%patch0 -p1
+%pom_remove_plugin :maven-enforcer-plugin
-%patch1 -p1
+
-%patch2 -p1
+# We don't want to support legacy Maven versions (older than 3.1)
-%patch3 -p1
+%pom_remove_dep org.sonatype.aether:
 
 %build
-# Tests fail to compile because they use unsupported legacy API.
+# Tests require legacy Maven
 %mvn_build -f
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%dir %{_javadir}/%{name}
 %doc LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Oct 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0-0.1.20151012svn1708080
+- Update to upstream 3.0 snapshot (svn revision 1708080)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-5802d23d48e8b5a4f75ae9176dd3ece5  maven-dependency-plugin-2.10-source-release.zip
+368a18ba9eb1934cafc7fe741458844c  maven-dependency-plugin-3.0-SNAPSHOT-source-release.zip