Author: pawelz Date: Thu Apr 29 13:45:37 2010 GMT
Module: packages Tag: JPACKAGE
---- Log message:
- s/maven2/maven/g in paths of patched files
---- Files affected:
packages/maven:
maven-plugins-jpprepolayout.patch (1.1.2.1 -> 1.1.2.2)
packages/maven:
maven-plugins-project-info-reports-jdkversion.patch (1.1.2.1 -> 1.1.2.2)
packages/maven:
maven-shade-plugin-replacement.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: packages/maven/maven-plugins-jpprepolayout.patch
diff -u packages/maven/maven-plugins-jpprepolayout.patch:1.1.2.1 packages/maven/maven-plugins-jpprepolayout.patch:1.1.2.2
--- packages/maven/maven-plugins-jpprepolayout.patch:1.1.2.1 Tue Apr 27 19:09:42 2010
+++ packages/maven/maven-plugins-jpprepolayout.patch Thu Apr 29 15:45:32 2010
@@ -1,6 +1,6 @@
diff -up maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
---- maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav 2007-05-18 09:25:57.000000000 -0400
-+++ maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java 2009-05-05 16:38:37.000000000 -0400
+--- maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav 2007-05-18 09:25:57.000000000 -0400
++++ maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java 2009-05-05 16:38:37.000000000 -0400
@@ -118,7 +118,11 @@ public abstract class AbstractProjectInf
{
if ( version == null )
@@ -15,8 +15,8 @@
VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
artifact = factory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar",
diff -up maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
---- maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav 2009-05-05 16:36:38.000000000 -0400
-+++ maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java 2009-05-05 16:36:47.000000000 -0400
+--- maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav 2009-05-05 16:36:38.000000000 -0400
++++ maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java 2009-05-05 16:36:47.000000000 -0400
@@ -376,7 +376,11 @@ public abstract class AbstractSiteRender
{
if ( version == null )
================================================================
Index: packages/maven/maven-plugins-project-info-reports-jdkversion.patch
diff -u packages/maven/maven-plugins-project-info-reports-jdkversion.patch:1.1.2.1 packages/maven/maven-plugins-project-info-reports-jdkversion.patch:1.1.2.2
--- packages/maven/maven-plugins-project-info-reports-jdkversion.patch:1.1.2.1 Tue Apr 27 19:09:42 2010
+++ packages/maven/maven-plugins-project-info-reports-jdkversion.patch Thu Apr 29 15:45:34 2010
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java.orig 2009-02-05 18:41:35.075639000 -0500
-+++ maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java 2009-02-05 18:50:43.416432000 -0500
+--- maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java.orig 2009-02-05 18:41:35.075639000 -0500
++++ maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java 2009-02-05 18:50:43.416432000 -0500
@@ -372,7 +372,10 @@
try
================================================================
Index: packages/maven/maven-shade-plugin-replacement.patch
diff -u packages/maven/maven-shade-plugin-replacement.patch:1.1.2.1 packages/maven/maven-shade-plugin-replacement.patch:1.1.2.2
--- packages/maven/maven-shade-plugin-replacement.patch:1.1.2.1 Tue Apr 27 19:09:42 2010
+++ packages/maven/maven-shade-plugin-replacement.patch Thu Apr 29 15:45:36 2010
@@ -1,6 +1,6 @@
diff -up ./maven2/maven-core/pom.xml.sav ./maven2/maven-core/pom.xml
---- ./maven2/maven-core/pom.xml.sav 2008-04-07 20:42:34.000000000 -0400
-+++ ./maven2/maven-core/pom.xml 2008-04-07 21:26:45.000000000 -0400
+--- ./maven/maven-core/pom.xml.sav 2008-04-07 20:42:34.000000000 -0400
++++ ./maven/maven-core/pom.xml 2008-04-07 21:26:45.000000000 -0400
@@ -10,9 +10,9 @@
<build>
<plugins>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven-plugins-jpprepolayout.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven-plugins-project-info-reports-jdkversion.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven-shade-plugin-replacement.patch?r1=1.1.2.1&r2=1.1.2.2&f=u