commit d69b8227cdbec7871a28ad5641e6e594b6e70f08
Author: Tomas Radej <tradej(a)redhat.com>
Date: Tue Sep 6 09:26:01 2011 +0200
Fixed dependency on plexus-container-default
maven-resources-plugin-plexus-dep.patch | 29 +++++++++++++++++++++++++++++
maven-resources-plugin.spec | 10 +++++++++-
2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/maven-resources-plugin-plexus-dep.patch
b/maven-resources-plugin-plexus-dep.patch
new file mode 100644
index 0000000..78ab5ef
--- /dev/null
+++ b/maven-resources-plugin-plexus-dep.patch
@@ -0,0 +1,29 @@
+diff --git a/pom.xml b/pom.xml
+index f74aea0..5bb5ce2 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -65,6 +65,11 @@ under the License.
+
+ <dependencies>
+ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-container-default</artifactId>
++ <version>1.0-alpha-9-stable-1</version>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+@@ -102,12 +107,6 @@ under the License.
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
+- <version>1.0-alpha-9-stable-1</version>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
+ </dependency>
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index c8983c7..5fb642a 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-resources-plugin
Version: 2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Resources Plugin
Group: Development/Libraries
@@ -10,6 +10,10 @@ URL:
http://maven.apache.org/plugins/maven-resources-plugin
#tar zcf maven-resources-plugin-2.5.tar.gz maven-resources-plugin-2.5/
Source0: %{name}-%{version}.tar.gz
+# Relocation of plexus-container-default is necessary as sisu gets to the
+# classpath first and uses an old version of a class from container-default
+Patch0: %{name}-plexus-dep.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -61,6 +65,7 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
mvn-rpmbuild \
@@ -92,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 06 2011 Tomas Radej <tradej(a)redhat.com> - 2.5-4
+- Fixed dependency on plexus-container-default
+
* Tue Aug 30 2011 Tomas Radej <tradej(a)redhat.com> - 2.5-3
- Added changelog