[maven-reporting-exec/f17] Plexus patch
Tomas Radej
tradej at fedoraproject.org
Tue May 15 15:28:03 UTC 2012
commit 2c79f203188f36e6169d2eda06a5c09c4ee9e989
Author: Tomas Radej <tradej at redhat.com>
Date: Thu Apr 26 15:40:57 2012 +0200
Plexus patch
maven-reporting-exec-plexus.patch | 58 +++++++++++++++++++++++++++++++++++++
maven-reporting-exec.spec | 3 +-
2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/maven-reporting-exec-plexus.patch b/maven-reporting-exec-plexus.patch
new file mode 100644
index 0000000..98c2b32
--- /dev/null
+++ b/maven-reporting-exec-plexus.patch
@@ -0,0 +1,58 @@
+diff --git a/pom.xml b/pom.xml
+index c519f2a..98be47f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -87,7 +87,7 @@
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+@@ -123,7 +123,7 @@
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+@@ -135,7 +135,7 @@
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+@@ -155,7 +155,7 @@
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+@@ -199,7 +199,7 @@
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+@@ -257,7 +257,7 @@
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.codehaus.plexus:plexus-component-api</exclude>
+- <exclude>org.codehaus.plexus:plexus-container-default</exclude>
++ <exclude>org.codehaus.plexus:plexus-component-metadata</exclude>
+ </excludes>
+ <message>The new containers are not supported. You probably added a dependency that is missing the exclusions.</message>
+ </bannedDependencies>
diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec
index 630b419..7bb3a8f 100644
--- a/maven-reporting-exec.spec
+++ b/maven-reporting-exec.spec
@@ -9,7 +9,7 @@ URL: http://maven.apache.org/shared/maven-reporting-exec/
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: maven-model-depmap.xml
-Patch0: %{name}-disabling-enforcer.patch
+Patch0: %{name}-plexus.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -40,6 +40,7 @@ The API documentation of %{name}.
%prep
%setup -qn %{name}-%{version}
+%patch0 -p1
# convert CR+LF to LF
sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
More information about the scm-commits
mailing list