[maven-dependency-plugin] Update to upstream version 2.6

[Mikolaj Izdebski]

commit 965c772060c4eef35e5720c447179f887222d9cb
Author: Mikolaj Izdebski 
Date:   Wed Jan 23 14:15:04 2013 +0100

Update to upstream version 2.6

- Build with xmvn
    - Install license files

.gitignore                                 |    1 +
 maven-dependency-plugin-removed-test.patch |   24 -------------
 maven-dependency-plugin.spec               |   52 ++++++++-------------------
 sources                                    |    2 +-
 4 files changed, 18 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc8ba5b..7b50aae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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-2.6-source-release.zip
diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec
index 2d03174..af0f405 100644
--- a/maven-dependency-plugin.spec
+++ b/maven-dependency-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-dependency-plugin
-Version:        2.5.1
-Release:        2%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        Plugin to manipulate, copy and unpack local and remote artifacts

Group:          Development/Libraries
@@ -12,8 +12,6 @@ Patch0:         0001-Add-setThreshold-stub.patch
 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
@@ -24,7 +22,7 @@ BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
 BuildRequires: ant
 BuildRequires: apache-commons-io
-BuildRequires: maven
+BuildRequires: maven-local
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-dependency-tree
@@ -42,16 +40,6 @@ BuildRequires: maven-project
 BuildRequires: maven-artifact-manager
 BuildRequires: maven-plugin-testing-tools

-Requires: maven
-Requires: jpackage-utils
-Requires: java
-Requires: maven-dependency-tree
-Requires: maven-shared-common-artifact-filters
-Requires: maven-shared-dependency-analyzer
-Requires: maven-shared-file-management
-Requires: maven-project
-Requires: maven-artifact-manager
-
 Obsoletes: maven2-plugin-dependency <= 0:2.0.8
 Provides: maven2-plugin-dependency = 1:%{version}-%{release}

@@ -64,7 +52,6 @@ repositories to a specified location.
 %package javadoc
 Group:          Documentation
 Summary:        API documentation for %{name}
-Requires:       jpackage-utils

%description javadoc
 %{summary}.
@@ -76,7 +63,6 @@ Requires:       jpackage-utils
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1

sed -i \
@@ -85,31 +71,25 @@ sed -i \

%build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+# Tests fail to compile because they use unsupported legacy API.
+%mvn_build -f

%install
-# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install

-# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc LICENSE NOTICE

-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE

%changelog
+* Wed Jan 23 2013 Mikolaj Izdebski  - 2.6-1
+- Update to upstream version 2.6
+- Build with xmvn
+- Install license files
+
 * Tue Jan 22 2013 Mikolaj Izdebski  - 2.5.1-2
 - Remove unneeded BR: asm2

diff --git a/sources b/sources
index b06c427..10c337c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39b9968f0482383761cb915d1a774146  maven-dependency-plugin-2.5.1-source-release.zip
+d763a948029e768c224c282b00b78d23  maven-dependency-plugin-2.6-source-release.zip