- s/maven2/maven/g in paths of patched files

Changed files:
    maven-2.0.8-excludeexternaljars.patch -> 1.1.2.2
    maven-MNG-3139.patch -> 1.1.2.2
    maven-addjdomtobootstrappath.patch -> 1.1.2.2
    maven-commons-cli-1.1.patch -> 1.1.2.2
    maven-enable-bootstrap-repository.patch -> 1.1.2.2
    maven-fastjar-manifest-fix.patch -> 1.1.2.2
    maven-javadoc-plugin-pom.patch -> 1.1.2.2
    maven-jpprepolayout.patch -> 1.1.2.2
    maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch -> 1.1.2.2
    maven-plugins-catch-uncaught-exceptions.patch -> 1.1.2.2
    maven-plugins-dependency-plugin-import-fix.patch -> 1.1.2.2
    maven-plugins-disablecobertura.patch -> 1.1.2.2
    maven-plugins-disableenforcer.patch -> 1.1.2.2
    maven-plugins-doxiaupdatefix.patch -> 1.1.2.2
    maven-plugins-javadoc-newdoxia.patch -> 1.1.2.2
    maven-plugins-jpprepolayout.patch -> 1.1.2.2
    maven-plugins-project-info-reports-jdkversion.patch -> 1.1.2.2
    maven-shade-plugin-replacement.patch -> 1.1.2.2
    maven-site-plugin-addservletdep.patch -> 1.1.2.2
    maven-sourcetarget.patch -> 1.1.2.2
    maven-use-unversioned-classworlds.patch -> 1.1.2.2

diff --git a/maven-2.0.8-excludeexternaljars.patch b/maven-2.0.8-excludeexternaljars.patch
index 031b875398b072ace78a78415e057b568efacda7..f1dd8d0dbc819e7dafb1efd034d979a75b643d60 100644 (file)
--- a/maven-2.0.8-excludeexternaljars.patch
+++ b/maven-2.0.8-excludeexternaljars.patch
@@ -1,5 +1,5 @@
---- ./maven2/maven-core/pom.xml.sav    2007-12-12 16:21:15.000000000 -0500
-+++ ./maven2/maven-core/pom.xml        2007-12-12 16:21:10.000000000 -0500
+--- ./maven/maven-core/pom.xml.sav     2007-12-12 16:21:15.000000000 -0500
++++ ./maven/maven-core/pom.xml 2007-12-12 16:21:10.000000000 -0500
 @@ -39,21 +39,23 @@
                    <exclude>junit:junit</exclude>
                    <exclude>jmock:jmock</exclude>

diff --git a/maven-MNG-3139.patch b/maven-MNG-3139.patch
index 40d01b19f776f87607d552e28096aaade8bf01e4..86a42f98574eeb307389240929eb7f3d2b76b6c3 100644 (file)
--- a/maven-MNG-3139.patch
+++ b/maven-MNG-3139.patch
@@ -1,5 +1,5 @@
---- maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java    2008/03/24 20:05:11     640549
-+++ maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java    2009/02/24 20:07:37     747533
+--- maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java     2008/03/24 20:05:11     640549
++++ maven/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java     2009/02/24 20:07:37     747533
 @@ -195,8 +195,7 @@
              ArtifactRepositoryPolicy policy =
                  metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();

diff --git a/maven-addjdomtobootstrappath.patch b/maven-addjdomtobootstrappath.patch
index 41e5a310a6f7b491168bdbb15b915c16f7355407..2e7ea066dccecad14e07d405c229b4557918e046 100644 (file)
--- a/maven-addjdomtobootstrappath.patch
+++ b/maven-addjdomtobootstrappath.patch
@@ -1,6 +1,6 @@
 diff -up ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF
---- ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav 2008-11-27 16:47:53.000000000 -0500
-+++ ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF     2008-11-27 16:48:22.000000000 -0500
+--- ./maven/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav  2008-11-27 16:47:53.000000000 -0500
++++ ./maven/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF      2008-11-27 16:48:22.000000000 -0500
 @@ -1,3 +1,3 @@
  Manifest-Version: 1.0
  Main-Class: org.apache.maven.bootstrap.installer.BootstrapInstaller

diff --git a/maven-commons-cli-1.1.patch b/maven-commons-cli-1.1.patch
index 3de760a539f1e5fafad916bd78de26ea9a7e3e55..8cdbc69fb421548f47d2c54d810aef634ca0489e 100644 (file)
--- a/maven-commons-cli-1.1.patch
+++ b/maven-commons-cli-1.1.patch
@@ -1,6 +1,6 @@
 diff -up ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java.sav ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
---- ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java.sav   2009-01-29 16:47:45.000000000 -0500
-+++ ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java       2009-01-29 16:48:00.000000000 -0500
+--- ./maven/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java.sav    2009-01-29 16:47:45.000000000 -0500
++++ ./maven/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java        2009-01-29 16:48:00.000000000 -0500
 @@ -645,7 +645,7 @@ public class MavenCli
                  "Force the use of an alternate POM file." ).create( ALTERNATE_POM_FILE ) );
  

diff --git a/maven-enable-bootstrap-repository.patch b/maven-enable-bootstrap-repository.patch
index 09057a80b78a1223b37be04b1bb72f7998fa4637..998a2e16f92112d77c91802e483a7d238b867ac3 100644 (file)
--- a/maven-enable-bootstrap-repository.patch
+++ b/maven-enable-bootstrap-repository.patch
@@ -1,5 +1,5 @@
---- maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2008-01-02 19:54:58.000000000 -0500
-+++ maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml     2008-01-02 19:56:27.000000000 -0500
+--- maven/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav  2008-01-02 19:54:58.000000000 -0500
++++ maven/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml      2008-01-02 19:56:27.000000000 -0500
 @@ -24,6 +24,15 @@ under the License.
  
    <repositories>

diff --git a/maven-fastjar-manifest-fix.patch b/maven-fastjar-manifest-fix.patch
index d7a2fc060a7a564c2e42658f22a0ebab8ace3229..48eacce998e6bc06b79c86ddb4aea73a3d23f9f0 100644 (file)
--- a/maven-fastjar-manifest-fix.patch
+++ b/maven-fastjar-manifest-fix.patch
@@ -1,5 +1,5 @@
---- ./maven2/bootstrap/bootstrap-mini/build.sav        2007-08-14 10:37:28.000000000 -0400
-+++ ./maven2/bootstrap/bootstrap-mini/build    2007-08-14 10:36:09.000000000 -0400
+--- ./maven/bootstrap/bootstrap-mini/build.sav 2007-08-14 10:37:28.000000000 -0400
++++ ./maven/bootstrap/bootstrap-mini/build     2007-08-14 10:36:09.000000000 -0400
 @@ -17,5 +17,5 @@ mkdir -p ${classesDir}
  )
  ret=$?; if [ $ret != 0 ]; then exit $ret; fi

diff --git a/maven-javadoc-plugin-pom.patch b/maven-javadoc-plugin-pom.patch
index e64a2d0f4b0027b0dea70822258a9f522f7be772..284a372113738143d5e02405e88aa97f4235091e 100644 (file)
--- a/maven-javadoc-plugin-pom.patch
+++ b/maven-javadoc-plugin-pom.patch
@@ -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>
  

diff --git a/maven-jpprepolayout.patch b/maven-jpprepolayout.patch
index 903db40ce77b12567359c96af312631e48453fc2..2ca7dee8f2a37932c0f1a21eefd54a3410fa76a1 100644 (file)
--- a/maven-jpprepolayout.patch
+++ b/maven-jpprepolayout.patch
@@ -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 @@ diff -up ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/b
          {
              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 @@ diff -up ./maven2/bootstrap/bootstrap-mini/build.sav ./maven2/bootstrap/bootstra
  
  ( 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 @@ diff -up ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootst
  
          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 @@ diff -up ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootst
          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 @@ diff -up ./maven2/bootstrap.sh.sav ./maven2/bootstrap.sh
  (
    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 @@ diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact
              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 @@ diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact
                          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 @@ diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact
                          // 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 @@ diff -up ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact
                  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/reposit
          }
  
 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/java/org/apache/maven/artifact/resolve
                          }
  
 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 @@ diff -up ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.x
       |
       | 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 @@ diff -up ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/Defau
  
          // 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 @@ diff -up ./maven2/maven-project/src/main/java/org/apache/maven/project/validatio
              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>

diff --git a/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch b/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
index 9f7cc51b2158bb49b565140b13c65cbf9fa205d6..2e61a389ae473babae3756d50c181d3f05b07f7a 100644 (file)
--- a/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
+++ b/maven-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
@@ -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

diff --git a/maven-plugins-catch-uncaught-exceptions.patch b/maven-plugins-catch-uncaught-exceptions.patch
index 0d64b5facababed3028ab91fe901fd58920beaa6..960b45a4a76b41b9b8bb28688d52640572404447 100644 (file)
--- a/maven-plugins-catch-uncaught-exceptions.patch
+++ b/maven-plugins-catch-uncaught-exceptions.patch
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav    2007-10-16 10:25:00.000000000 -0400
-+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java        2007-10-16 10:26:27.000000000 -0400
+--- maven-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav     2007-10-16 10:25:00.000000000 -0400
++++ maven-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java 2007-10-16 10:26:27.000000000 -0400
 @@ -241,6 +241,11 @@ public abstract class AbstractDependency
              throw new MojoExecutionException( "Error unpacking file: " + file + " to: " + location + "\r\n"
                  + e.toString(), e );
@@ -12,8 +12,8 @@
      }
  
      private void silenceUnarchiver( UnArchiver unArchiver )
---- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java.sav       2007-10-16 10:23:42.000000000 -0400
-+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java   2007-10-16 10:26:51.000000000 -0400
+--- maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java.sav        2007-10-16 10:23:42.000000000 -0400
++++ maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java    2007-10-16 10:26:51.000000000 -0400
 @@ -62,6 +62,11 @@ public final class AssemblyFileUtils
          {
              throw new ArchiveExpansionException( "Error unpacking file: " + source + "to: " + destDir, e );

diff --git a/maven-plugins-dependency-plugin-import-fix.patch b/maven-plugins-dependency-plugin-import-fix.patch
index ba8803f370eff1e27272a699d01c2ccf46b8449b..b18468ebed99d72d091ee3e4602da255dca07177 100644 (file)
--- a/maven-plugins-dependency-plugin-import-fix.patch
+++ b/maven-plugins-dependency-plugin-import-fix.patch
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav    2007-10-17 17:23:05.000000000 -0400
-+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java        2007-10-17 17:24:49.000000000 -0400
+--- maven-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav     2007-10-17 17:23:05.000000000 -0400
++++ maven-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java 2007-10-17 17:24:49.000000000 -0400
 @@ -20,6 +20,7 @@ package org.apache.maven.plugin.dependen
   */
  

diff --git a/maven-plugins-disablecobertura.patch b/maven-plugins-disablecobertura.patch
index bdcc4ad95d20761b75b05eb949544a493e1808a2..f314fe0713acb3b14f2e8db40663a46d6a153482 100644 (file)
--- a/maven-plugins-disablecobertura.patch
+++ b/maven-plugins-disablecobertura.patch
@@ -1,6 +1,6 @@
 diff -up ./maven2-plugins/maven-dependency-plugin/pom.xml.sav ./maven2-plugins/maven-dependency-plugin/pom.xml
---- ./maven2-plugins/maven-dependency-plugin/pom.xml.sav       2007-07-04 12:36:14.000000000 -0400
-+++ ./maven2-plugins/maven-dependency-plugin/pom.xml   2008-04-03 15:01:06.000000000 -0400
+--- ./maven-plugins/maven-dependency-plugin/pom.xml.sav        2007-07-04 12:36:14.000000000 -0400
++++ ./maven-plugins/maven-dependency-plugin/pom.xml    2008-04-03 15:01:06.000000000 -0400
 @@ -75,21 +75,6 @@
                </license>
        </licenses>

diff --git a/maven-plugins-disableenforcer.patch b/maven-plugins-disableenforcer.patch
index da8036c7af48129597017ef287c5cce65304fc54..de226eae5ea35a8c3a4dbb26bab9b32467e56bbf 100644 (file)
--- a/maven-plugins-disableenforcer.patch
+++ b/maven-plugins-disableenforcer.patch
@@ -1,5 +1,5 @@
---- maven2-plugins/pom.xml.sav 2009-09-02 14:44:36.000000000 -0400
-+++ maven2-plugins/pom.xml     2009-09-02 14:44:48.000000000 -0400
+--- maven-plugins/pom.xml.sav  2009-09-02 14:44:36.000000000 -0400
++++ maven-plugins/pom.xml      2009-09-02 14:44:48.000000000 -0400
 @@ -106,7 +106,6 @@
      <module>maven-ear-plugin</module>
      <module>maven-eclipse-plugin</module>

diff --git a/maven-plugins-doxiaupdatefix.patch b/maven-plugins-doxiaupdatefix.patch
index 5931a66d1255fc978c5693ebfb6ea1aee00596dc..1690eab1974ed685fae2b54db48487365f715d53 100644 (file)
--- a/maven-plugins-doxiaupdatefix.patch
+++ b/maven-plugins-doxiaupdatefix.patch
@@ -1,5 +1,5 @@
---- ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java.sav   2007-10-15 16:27:27.000000000 -0400
-+++ ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java       2007-10-15 17:15:23.000000000 -0400
+--- ./maven-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java.sav    2007-10-15 16:27:27.000000000 -0400
++++ ./maven-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java        2007-10-15 17:15:23.000000000 -0400
 @@ -25,6 +25,7 @@ import java.util.Iterator;
  import java.util.List;
  import java.util.Locale;

diff --git a/maven-plugins-javadoc-newdoxia.patch b/maven-plugins-javadoc-newdoxia.patch
index 756f5958446b56c3450bc6cf1ff7c683bc11eb9d..7a44d5ee0532f9a64afd8c6cdbfbd86d24c0414f 100644 (file)
--- a/maven-plugins-javadoc-newdoxia.patch
+++ b/maven-plugins-javadoc-newdoxia.patch
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig  2009-01-31 12:28:40.393331000 -0500
-+++ maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java       2009-01-31 18:17:01.921601000 -0500
+--- maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig   2009-01-31 12:28:40.393331000 -0500
++++ maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java        2009-01-31 18:17:01.921601000 -0500
 @@ -26,6 +26,7 @@
  import org.apache.maven.plugin.MojoFailureException;
  import org.apache.maven.reporting.MavenReport;

diff --git a/maven-plugins-jpprepolayout.patch b/maven-plugins-jpprepolayout.patch
index bca0d0c9133c7e04b346fe5458ef857a7b64b727..8e72d2e6b64af20963b331c55d454eb2ad992895 100644 (file)
--- a/maven-plugins-jpprepolayout.patch
+++ b/maven-plugins-jpprepolayout.patch
@@ -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 @@ diff -up maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apac
              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 )

diff --git a/maven-plugins-project-info-reports-jdkversion.patch b/maven-plugins-project-info-reports-jdkversion.patch
index 50a7af9c395a675c4d9bddc08c19542d4e50a0ca..3a5dffbe91bd59967cbada77600f5c9057511aea 100644 (file)
--- a/maven-plugins-project-info-reports-jdkversion.patch
+++ b/maven-plugins-project-info-reports-jdkversion.patch
@@ -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

diff --git a/maven-shade-plugin-replacement.patch b/maven-shade-plugin-replacement.patch
index 12fcc26cbf03a48827e5648f5560f6f85800171b..68a103a76a21b092cb08a776aee0b5078faab339 100644 (file)
--- a/maven-shade-plugin-replacement.patch
+++ b/maven-shade-plugin-replacement.patch
@@ -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>

diff --git a/maven-site-plugin-addservletdep.patch b/maven-site-plugin-addservletdep.patch
index 3c74ce501774bed58c5a9912a3f0bdb1505d1440..46465c691eaa6024401269032ad69ab50b119850 100644 (file)
--- a/maven-site-plugin-addservletdep.patch
+++ b/maven-site-plugin-addservletdep.patch
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-site-plugin/pom.xml.orig      2009-01-27 12:46:58.030715000 -0500
-+++ maven2-plugins/maven-site-plugin/pom.xml   2009-01-27 12:47:44.980506000 -0500
+--- maven-plugins/maven-site-plugin/pom.xml.orig       2009-01-27 12:46:58.030715000 -0500
++++ maven-plugins/maven-site-plugin/pom.xml    2009-01-27 12:47:44.980506000 -0500
 @@ -184,11 +184,18 @@
        <artifactId>plexus-utils</artifactId>
        <version>1.4.1</version>

diff --git a/maven-sourcetarget.patch b/maven-sourcetarget.patch
index 721845ad955f277b25553622d7e028b086805833..a6231b08f5fef7b7aa25ca1d5bd4a2f3c6b3dc9b 100644 (file)
--- a/maven-sourcetarget.patch
+++ b/maven-sourcetarget.patch
@@ -1,5 +1,5 @@
---- maven2/pom.xml.orig        2008-12-15 19:25:32.425274000 -0500
-+++ maven2/pom.xml     2008-12-15 19:25:38.498479000 -0500
+--- maven/pom.xml.orig 2008-12-15 19:25:32.425274000 -0500
++++ maven/pom.xml      2008-12-15 19:25:38.498479000 -0500
 @@ -66,6 +66,10 @@
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-compiler-plugin</artifactId>

diff --git a/maven-use-unversioned-classworlds.patch b/maven-use-unversioned-classworlds.patch
index 4073fa08ea01f90e6235cf6a8e8508ab8b7f0c35..20877fed0e144ed759828c320a93452b36d1662b 100644 (file)
--- a/maven-use-unversioned-classworlds.patch
+++ b/maven-use-unversioned-classworlds.patch
@@ -1,5 +1,5 @@
---- maven2/maven-core/src/bin/mvn.sav  2008-01-02 19:45:36.000000000 -0500
-+++ maven2/maven-core/src/bin/mvn      2008-01-02 19:45:48.000000000 -0500
+--- maven/maven-core/src/bin/mvn.sav   2008-01-02 19:45:36.000000000 -0500
++++ maven/maven-core/src/bin/mvn       2008-01-02 19:45:48.000000000 -0500
 @@ -160,7 +160,7 @@ fi
  
  exec "$JAVACMD" \