[maven-reporting-exec/f17] Fixed enforcer patch

[Tomas Radej]

commit 1b99c14292ae6c573f8a49215c4f36da2fc8572a
Author: Tomas Radej <tradej at redhat.com>
Date:   Mon May 14 15:45:31 2012 +0200

    Fixed enforcer patch

 maven-reporting-exec-disabling-enforcer.patch |   85 +++++++++----------------
 maven-reporting-exec.spec                     |    9 +--
 2 files changed, 35 insertions(+), 59 deletions(-)
---
diff --git a/maven-reporting-exec-disabling-enforcer.patch b/maven-reporting-exec-disabling-enforcer.patch
index 98c2b32..ed72019 100644
--- a/maven-reporting-exec-disabling-enforcer.patch
+++ b/maven-reporting-exec-disabling-enforcer.patch
@@ -1,58 +1,35 @@
 diff --git a/pom.xml b/pom.xml
-index c519f2a..98be47f 100644
+index c519f2a..d7e1a41 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>
+@@ -243,30 +243,6 @@
+           </execution>
+         </executions>
+       </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-enforcer-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>enforce</goal>
+-            </goals>
+-            <id>ensure-no-container-api</id>
+-            <configuration>
+-              <rules>
+-                <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>
+-                  </excludes>
+-                  <message>The new containers are not supported. You probably added a dependency that is missing the exclusions.</message>
+-                </bannedDependencies>
+-              </rules>
+-              <fail>true</fail>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+     </plugins>
+   </build>
+ </project>
diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec
index 3cabba0..296c2f8 100644
--- a/maven-reporting-exec.spec
+++ b/maven-reporting-exec.spec
@@ -9,16 +9,16 @@ 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}-plexus.patch
-Patch1:         %{name}-disabling-enforcer.patch
+Patch0:         %{name}-disabling-enforcer.patch
 
+BuildRequires:  sisu
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  maven
 BuildRequires:  plexus-containers-component-metadata
+BuildRequires:  plexus-containers-container-default
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  maven-enforcer-plugin
 
 Requires:       java
 Requires:       maven
@@ -43,7 +43,6 @@ The API documentation of %{name}.
 %prep
 %setup -qn %{name}-%{version}
 
-%patch1 -p1
 
 # convert CR+LF to LF
 sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
@@ -54,7 +53,7 @@ sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
 # Test.failure.ignore=true is here because a test of MavenReportExecutor
 # fails with PlexusContainerException
 mvn-rpmbuild install javadoc:aggregate -Dmaven.local.depmap.file=%{SOURCE1} \
- -Dmaven.test.failure.ignore=true 
+ -Dmaven.test.failure.ignore=true -Xe