rpms/maven-enforcer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove RPM bug workaround

Browse Source
This commit is contained in:
Mikolaj Izdebski 2012-10-15 06:18:02 +02:00
parent 48627a86e6
commit 3aaf867091
4 changed files with 4 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maven-enforcer-maven3-compat.patch
View File

@ -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 @@
<dependencies>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>

34
maven-enforcer-migration-to-component-metadata.patch
View File

@ -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 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
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 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>

31
maven-enforcer-requirePluginVersions-maven3-compatibility.patch
View File

@ -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 );

11
maven-enforcer.spec
View File

@ -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 <mizdebsk@redhat.com> - 1.1.1-2
- Remove RPM bug workaround
* Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-1
- Update to upstream version 1.1.1
- Convert patches to POM macro