[maven2-core] 16/38: * Remove broken patch from last release. * Update the plexus-utils version from version 1.1 to 1.5.15.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2-core.

commit cfdb3a274b34cb775667cfefb29e9475a6500496
Author: Torsten Werner <twerner at debian.org>
Date:   Sun May 16 15:16:46 2010 +0000

    * Remove broken patch from last release.
    * Update the plexus-utils version from version 1.1 to 1.5.15.
---
 debian/changelog                                   |  7 +++++
 ...ll-back-to-debian-version-of-plexus-utils.patch | 30 ----------------------
 debian/patches/0003-update-plexus-utils.patch      | 22 ++++++++++++++++
 debian/patches/series                              |  2 +-
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5aea66f..04f916e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven2-core (2.2.1-4) unstable; urgency=low
+
+  * Remove broken patch from last release.
+  * Update the plexus-utils version from version 1.1 to 1.5.15.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 16 May 2010 16:55:55 +0200
+
 maven2-core (2.2.1-3) unstable; urgency=low
 
   * Convert patches to dep3 format.
diff --git a/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch b/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch
deleted file mode 100644
index 5b56282..0000000
--- a/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sun, 16 May 2010 13:23:59 +0200
-Subject: [PATCH] fall back to "debian" version of plexus-utils
-
-... instead of loading version 1.1 only
----
- .../apache/maven/plugin/DefaultPluginManager.java  |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
-index 696b607..2c85c46 100644
---- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
-+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
-@@ -946,7 +946,14 @@ public class DefaultPluginManager
-                 result.addAll( dependencyArtifacts );
-             }
- 
--            result.add( artifactFactory.createArtifact( "org.codehaus.plexus", "plexus-utils", "1.1", Artifact.SCOPE_RUNTIME, "jar" ) );
-+            try
-+            {
-+                result.add( artifactFactory.createArtifact( "org.codehaus.plexus", "plexus-utils", "1.1", Artifact.SCOPE_RUNTIME, "jar" ) );
-+            }
-+            catch ( Exception e )
-+            {
-+                result.add( artifactFactory.createArtifact( "org.codehaus.plexus", "plexus-utils", "debian", Artifact.SCOPE_RUNTIME, "jar" ) );
-+            }
- 
-             return result;
-         }
--- 
diff --git a/debian/patches/0003-update-plexus-utils.patch b/debian/patches/0003-update-plexus-utils.patch
new file mode 100644
index 0000000..fac835b
--- /dev/null
+++ b/debian/patches/0003-update-plexus-utils.patch
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 16 May 2010 16:58:55 +0200
+Subject: [PATCH] update plexus-utils
+
+---
+ .../apache/maven/plugin/DefaultPluginManager.java  |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+index 696b607..dd69490 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+@@ -946,7 +946,7 @@ public class DefaultPluginManager
+                 result.addAll( dependencyArtifacts );
+             }
+ 
+-            result.add( artifactFactory.createArtifact( "org.codehaus.plexus", "plexus-utils", "1.1", Artifact.SCOPE_RUNTIME, "jar" ) );
++            result.add( artifactFactory.createArtifact( "org.codehaus.plexus", "plexus-utils", "1.5.15", Artifact.SCOPE_RUNTIME, "jar" ) );
+ 
+             return result;
+         }
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 10721ea..b8a6a90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 0001-remove-webdav-support.patch
 0002-update-plugin-versions.patch
-0003-fall-back-to-debian-version-of-plexus-utils.patch
+0003-update-plexus-utils.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2-core.git