commit fc8a8ae36634b3ce54dbecc218228de0f9508e89
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jul 25 14:54:58 2011 +0200
Update to latest upstream (2.3)
.gitignore | 1 +
0001-Add-setThreshold-stub.patch | 33 +++++++++++++++++++++++++++++++++
maven-dependency-plugin.spec | 32 ++++++++++++++++++++------------
sources | 2 +-
4 files changed, 55 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46d6b05..1512a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-dependency-plugin-2.2.tar.xz
/maven-dependency-plugin-2.2-source-release.zip
+/maven-dependency-plugin-2.3-source-release.zip
diff --git a/0001-Add-setThreshold-stub.patch b/0001-Add-setThreshold-stub.patch
new file mode 100644
index 0000000..3b04c33
--- /dev/null
+++ b/0001-Add-setThreshold-stub.patch
@@ -0,0 +1,33 @@
+From 052c1cafc64c7fa4a15e9a8f2dedfa9d5cdbf19a Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)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
+
diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec
index 1b19529..aa833f7 100644
--- a/maven-dependency-plugin.spec
+++ b/maven-dependency-plugin.spec
@@ -1,12 +1,13 @@
Name: maven-dependency-plugin
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.3
+Release: 1%{?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}...
+Patch0: 0001-Add-setThreshold-stub.patch
BuildArch: noarch
@@ -27,14 +28,17 @@ BuildRequires: maven-shared-dependency-analyzer
BuildRequires: maven-shared-dependency-tree
BuildRequires: maven-shared-common-artifact-filters
BuildRequires: maven-shared-file-management
+BuildRequires: maven-project
+BuildRequires: maven-artifact-manager
+
Requires: maven
Requires: jpackage-utils
Requires: java
Requires: maven-shared-common-artifact-filters
Requires: maven-shared-dependency-analyzer
Requires: maven-shared-file-management
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: maven-project
+Requires: maven-artifact-manager
Obsoletes: maven2-plugin-dependency <= 0:2.0.8
Provides: maven2-plugin-dependency = 1:%{version}-%{release}
@@ -55,7 +59,9 @@ Requires: jpackage-utils
%prep
-%setup -q
+%setup -q
+
+%patch0 -p1
sed -i \
's:org.codehaus.classworlds.ClassRealm:org.codehaus.plexus.classworlds.realm.ClassRealm:'
\
@@ -63,32 +69,34 @@ sed -i \
%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
+mvn-rpmbuild -Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
# jars
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
-
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%{_javadocdir}/%{name}
%changelog
+* Mon Jul 11 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.3-1
+- Update to latest upstream
+
* Tue Jun 28 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-2
- BR/R maven-shared-file-management.
diff --git a/sources b/sources
index 9d06924..663f640 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eaf703fd03dbfa3e0f78430623bbd63a maven-dependency-plugin-2.2-source-release.zip
+c21a7404356997fef2de3bdbd4ba0272 maven-dependency-plugin-2.3-source-release.zip