packages (JPACKAGE): maven/maven-javadoc-plugin-pom.patch, maven/maven-jppr...
pawelz
pawelz at pld-linux.org
Thu Apr 29 15:45:20 CEST 2010
Author: pawelz Date: Thu Apr 29 13:45:20 2010 GMT
Module: packages Tag: JPACKAGE
---- Log message:
- s/maven2/maven/g in paths of patched files
---- Files affected:
packages/maven:
maven-javadoc-plugin-pom.patch (1.1.2.1 -> 1.1.2.2)
packages/maven:
maven-jpprepolayout.patch (1.1.2.1 -> 1.1.2.2)
packages/maven:
maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: packages/maven/maven-javadoc-plugin-pom.patch
diff -u packages/maven/maven-javadoc-plugin-pom.patch:1.1.2.1 packages/maven/maven-javadoc-plugin-pom.patch:1.1.2.2
--- packages/maven/maven-javadoc-plugin-pom.patch:1.1.2.1 Tue Apr 27 19:09:42 2010
+++ packages/maven/maven-javadoc-plugin-pom.patch Thu Apr 29 15:45:14 2010
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-javadoc-plugin/pom.xml.orig 2009-01-31 09:47:18.423411000 -0500
-+++ maven2-plugins/maven-javadoc-plugin/pom.xml 2009-01-31 10:39:38.671359000 -0500
+--- maven-plugins/maven-javadoc-plugin/pom.xml.orig 2009-01-31 09:47:18.423411000 -0500
++++ maven-plugins/maven-javadoc-plugin/pom.xml 2009-01-31 10:39:38.671359000 -0500
@@ -38,7 +38,7 @@
<inceptionYear>2004</inceptionYear>
================================================================
Index: packages/maven/maven-jpprepolayout.patch
diff -u packages/maven/maven-jpprepolayout.patch:1.1.2.1 packages/maven/maven-jpprepolayout.patch:1.1.2.2
--- packages/maven/maven-jpprepolayout.patch:1.1.2.1 Tue Apr 27 19:09:42 2010
+++ packages/maven/maven-jpprepolayout.patch Thu Apr 29 15:45:16 2010
@@ -1,6 +1,6 @@
diff -up ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java.sav ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
---- ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java.sav 2007-09-08 19:20:50.000000000 -0400
-+++ ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java 2009-05-05 15:28:38.000000000 -0400
+--- ./maven/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java.sav 2007-09-08 19:20:50.000000000 -0400
++++ ./maven/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java 2009-05-05 15:28:38.000000000 -0400
@@ -57,6 +57,8 @@ public class BootstrapInstaller
private boolean offline;
@@ -32,8 +32,8 @@
{
cli.createArgument().setValue( args[i] );
diff -up ./maven2/bootstrap/bootstrap-mini/build.sav ./maven2/bootstrap/bootstrap-mini/build
---- ./maven2/bootstrap/bootstrap-mini/build.sav 2006-12-11 23:53:43.000000000 -0500
-+++ ./maven2/bootstrap/bootstrap-mini/build 2009-05-05 15:28:38.000000000 -0400
+--- ./maven/bootstrap/bootstrap-mini/build.sav 2006-12-11 23:53:43.000000000 -0500
++++ ./maven/bootstrap/bootstrap-mini/build 2009-05-05 15:28:38.000000000 -0400
@@ -9,6 +9,11 @@ rm -rf bootstrap-mini.jar ${buildDir} >
mkdir -p ${classesDir}
@@ -47,8 +47,8 @@
( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
diff -up ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java.sav ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
---- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java.sav 2007-06-15 02:19:15.000000000 -0400
-+++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java 2009-05-05 15:28:38.000000000 -0400
+--- ./maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java.sav 2007-06-15 02:19:15.000000000 -0400
++++ ./maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java 2009-05-05 15:28:38.000000000 -0400
@@ -49,7 +49,8 @@ public class OnlineArtifactDownloader
private String proxyPassword;
@@ -98,8 +98,8 @@
return remoteRepositories;
diff -up ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java.sav ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java
---- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java.sav 2006-07-08 11:46:08.000000000 -0400
-+++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java.sav 2006-07-08 11:46:08.000000000 -0400
++++ ./maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java 2009-05-05 15:28:37.000000000 -0400
@@ -18,6 +18,8 @@ package org.apache.maven.bootstrap.model
import java.io.File;
@@ -215,8 +215,8 @@
else
{
diff -up ./maven2/bootstrap.sh.sav ./maven2/bootstrap.sh
---- ./maven2/bootstrap.sh.sav 2007-03-18 20:43:54.000000000 -0400
-+++ ./maven2/bootstrap.sh 2009-05-05 15:28:38.000000000 -0400
+--- ./maven/bootstrap.sh.sav 2007-03-18 20:43:54.000000000 -0400
++++ ./maven/bootstrap.sh 2009-05-05 15:28:38.000000000 -0400
@@ -8,7 +8,7 @@ if [ -z "$JAVA_HOME" ]; then
exit 1
fi
@@ -227,8 +227,8 @@
(
cd bootstrap/bootstrap-mini
diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
---- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav 2007-03-26 21:05:38.000000000 -0400
-+++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav 2007-03-26 21:05:38.000000000 -0400
++++ ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java 2009-05-05 15:28:37.000000000 -0400
@@ -340,9 +340,25 @@ public class DefaultWagonManager
else if ( repository.isBlacklisted() )
{
@@ -259,8 +259,8 @@
getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy(),
false );
diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
---- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav 2007-10-16 16:40:07.000000000 -0400
-+++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav 2007-10-16 16:40:07.000000000 -0400
++++ ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java 2009-05-05 15:28:37.000000000 -0400
@@ -88,7 +88,9 @@ public class DefaultRepositoryMetadataMa
boolean metadataIsEmpty = true;
@@ -273,8 +273,8 @@
getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
---- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav 2007-09-10 20:36:31.000000000 -0400
-+++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav 2007-09-10 20:36:31.000000000 -0400
++++ ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java 2009-05-05 15:28:37.000000000 -0400
@@ -184,7 +184,9 @@ public class DefaultArtifactResolver
try
{
@@ -287,8 +287,8 @@
// the transformations discovered the artifact - so use it exclusively
wagonManager.getArtifact( artifact, artifact.getRepository() );
diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java.sav ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
---- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java.sav 2007-01-11 02:47:53.000000000 -0500
-+++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java 2009-05-05 15:27:21.000000000 -0400
+--- ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java.sav 2007-01-11 02:47:53.000000000 -0500
++++ ./maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java 2009-05-05 15:27:21.000000000 -0400
@@ -46,7 +46,11 @@ public class ReleaseArtifactTransformati
{
try
@@ -303,8 +303,8 @@
if ( Artifact.RELEASE_VERSION.equals( version ) )
{
diff -up ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
---- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav 2007-01-11 02:47:53.000000000 -0500
-+++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav 2007-01-11 02:47:53.000000000 -0500
++++ ./maven/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java 2009-05-05 15:28:37.000000000 -0400
@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -362,8 +362,8 @@
}
diff -up ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
---- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav 2007-11-05 09:24:53.000000000 -0500
-+++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav 2007-11-05 09:24:53.000000000 -0500
++++ ./maven/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java 2009-05-05 15:28:37.000000000 -0400
@@ -267,7 +267,8 @@ public class DefaultArtifactCollector
// set the recommended version
// TODO: maybe its better to just pass the range through to retrieval and use a transformation?
@@ -391,8 +391,8 @@
}
diff -up ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml
---- ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav 2007-09-18 15:19:35.000000000 -0400
-+++ ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav 2007-09-18 15:19:35.000000000 -0400
++++ ./maven/maven-artifact/src/main/resources/META-INF/plexus/components.xml 2009-05-05 15:28:37.000000000 -0400
@@ -31,6 +31,12 @@ under the License.
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
</component>
@@ -407,8 +407,8 @@
|
| ArtifactHandlerManager
diff -up ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
---- ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav 2007-10-16 17:43:07.000000000 -0400
-+++ ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav 2007-10-16 17:43:07.000000000 -0400
++++ ./maven/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java 2009-05-05 15:28:37.000000000 -0400
@@ -224,9 +224,16 @@ public class DefaultPluginVersionManager
}
@@ -428,8 +428,8 @@
// if the plugin registry is inactive, then the rest of this goop is useless...
diff -up ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
---- ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav 2007-01-11 02:47:53.000000000 -0500
-+++ ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav 2007-01-11 02:47:53.000000000 -0500
++++ ./maven/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java 2009-05-05 15:28:37.000000000 -0400
@@ -43,7 +43,7 @@ import java.util.List;
public class DefaultModelValidator
implements ModelValidator
@@ -469,8 +469,8 @@
return match;
}
diff -up ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
---- ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2007-01-11 02:47:53.000000000 -0500
-+++ ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml 2009-05-05 15:28:37.000000000 -0400
+--- ./maven/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2007-01-11 02:47:53.000000000 -0500
++++ ./maven/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml 2009-05-05 15:28:37.000000000 -0400
@@ -24,6 +24,15 @@ under the License.
<repositories>
================================================================
Index: packages/maven/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
diff -u packages/maven/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch:1.1.2.1 packages/maven/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch:1.1.2.2
--- packages/maven/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch:1.1.2.1 Tue Apr 27 19:09:42 2010
+++ packages/maven/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch Thu Apr 29 15:45:18 2010
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java.orig 2009-01-27 09:50:15.158248000 -0500
-+++ maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java 2009-01-27 09:51:49.692700000 -0500
+--- maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java.orig 2009-01-27 09:50:15.158248000 -0500
++++ maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java 2009-01-27 09:51:49.692700000 -0500
@@ -82,7 +82,6 @@
* @version $Id$
* @requiresDependencyResolution compile
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven-javadoc-plugin-pom.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-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-MJAVADOC-137-AbstractJavadocMojo.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
More information about the pld-cvs-commit
mailing list