diff --git a/maven-enforcer-maven3-compat.patch b/maven-enforcer-maven3-compat.patch deleted file mode 100644 index f4249fa..0000000 --- a/maven-enforcer-maven3-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur enforcer-1.0.1.orig/enforcer-rules/pom.xml enforcer-1.0.1/enforcer-rules/pom.xml ---- enforcer-1.0.1.orig/enforcer-rules/pom.xml 2012-02-02 18:05:33.000000000 +0100 -+++ enforcer-1.0.1/enforcer-rules/pom.xml 2012-02-02 18:08:23.180927367 +0100 -@@ -36,6 +36,11 @@ - - - -+ org.apache.maven -+ maven-compat -+ 3.0.3 -+ -+ - org.apache.maven - maven-artifact - diff --git a/maven-enforcer-migration-to-component-metadata.patch b/maven-enforcer-migration-to-component-metadata.patch deleted file mode 100644 index d8f8608..0000000 --- a/maven-enforcer-migration-to-component-metadata.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur enforcer-1.0.1.orig/enforcer-api/pom.xml enforcer-1.0.1/enforcer-api/pom.xml ---- enforcer-1.0.1.orig/enforcer-api/pom.xml 2011-06-14 20:48:04.000000000 +0200 -+++ enforcer-1.0.1/enforcer-api/pom.xml 2012-02-02 17:59:04.643725565 +0100 -@@ -59,11 +59,11 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - - - -- descriptor -+ generate-metadata - - - -diff -Naur enforcer-1.0.1.orig/enforcer-rules/pom.xml enforcer-1.0.1/enforcer-rules/pom.xml ---- enforcer-1.0.1.orig/enforcer-rules/pom.xml 2011-06-14 20:48:04.000000000 +0200 -+++ enforcer-1.0.1/enforcer-rules/pom.xml 2012-02-02 17:58:46.100495315 +0100 -@@ -101,11 +101,11 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - - - -- descriptor -+ generate-metadata - - - diff --git a/maven-enforcer-requirePluginVersions-maven3-compatibility.patch b/maven-enforcer-requirePluginVersions-maven3-compatibility.patch deleted file mode 100644 index 3b13d6c..0000000 --- a/maven-enforcer-requirePluginVersions-maven3-compatibility.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java -=================================================================== ---- enforcer-rules.orig/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (revision 1087082) -+++ enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (working copy) -@@ -128,7 +128,7 @@ - private Map phaseToLifecycleMap; - - /** The lifecycles. */ -- private List lifecycles; -+ private Collection lifecycles; - - /** The factory. */ - ArtifactFactory factory; -@@ -175,14 +175,9 @@ - } - catch (Exception e) - { -- log.info( "The requirePluginVersions rule is currently not compatible with Maven3."); -- /* -- * -- * NOTE: If this happens, we're bailing out right away. -- * -- * -- */ -- return; -+ Object defaultLifeCycles = ReflectionUtils.getValueIncludingSuperclasses("defaultLifeCycles", life); -+ Map lifecyclesMap = (Map)ReflectionUtils.getValueIncludingSuperclasses("lifecycles", defaultLifeCycles); -+ lifecycles = lifecyclesMap.values(); - } - session = (MavenSession) helper.evaluate( "${session}" ); - pluginManager = (PluginManager) helper.getComponent( PluginManager.class ); diff --git a/maven-enforcer.spec b/maven-enforcer.spec index 9313e51..884587f 100644 --- a/maven-enforcer.spec +++ b/maven-enforcer.spec @@ -1,6 +1,6 @@ Name: maven-enforcer Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Enforcer Group: Development/Libraries @@ -119,12 +119,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} -%pre javadoc -# workaround for rpm bug, can be removed in F-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - - %files %dir %{_javadir}/%{name} %{_mavenpomdir}/JPP-%{name}.pom @@ -150,6 +144,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Mon Oct 15 2012 Mikolaj Izdebski - 1.1.1-2 +- Remove RPM bug workaround + * Fri Oct 12 2012 Mikolaj Izdebski - 1.1.1-1 - Update to upstream version 1.1.1 - Convert patches to POM macro