Author: twerner Date: 2010-05-16 15:16:46 +0000 (Sun, 16 May 2010) New Revision: 12433
Added: trunk/maven2-core/debian/patches/0003-update-plexus-utils.patch Removed: trunk/maven2-core/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch Modified: trunk/maven2-core/debian/changelog trunk/maven2-core/debian/patches/series Log: * Remove broken patch from last release. * Update the plexus-utils version from version 1.1 to 1.5.15. Modified: trunk/maven2-core/debian/changelog =================================================================== --- trunk/maven2-core/debian/changelog 2010-05-16 12:07:12 UTC (rev 12432) +++ trunk/maven2-core/debian/changelog 2010-05-16 15:16:46 UTC (rev 12433) @@ -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 <[email protected]> Sun, 16 May 2010 16:55:55 +0200 + maven2-core (2.2.1-3) unstable; urgency=low * Convert patches to dep3 format. Deleted: trunk/maven2-core/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch =================================================================== --- trunk/maven2-core/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch 2010-05-16 12:07:12 UTC (rev 12432) +++ trunk/maven2-core/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch 2010-05-16 15:16:46 UTC (rev 12433) @@ -1,30 +0,0 @@ -From: Torsten Werner <[email protected]> -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; - } --- Added: trunk/maven2-core/debian/patches/0003-update-plexus-utils.patch =================================================================== --- trunk/maven2-core/debian/patches/0003-update-plexus-utils.patch (rev 0) +++ trunk/maven2-core/debian/patches/0003-update-plexus-utils.patch 2010-05-16 15:16:46 UTC (rev 12433) @@ -0,0 +1,22 @@ +From: Torsten Werner <[email protected]> +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; + } +-- Modified: trunk/maven2-core/debian/patches/series =================================================================== --- trunk/maven2-core/debian/patches/series 2010-05-16 12:07:12 UTC (rev 12432) +++ trunk/maven2-core/debian/patches/series 2010-05-16 15:16:46 UTC (rev 12433) @@ -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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
