[maven2-core] 15/38: * Convert patches to dep3 format. * Add a patch to fall back to version 'debian' of plexus-utils if loading of version '1.1' fails.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 27 13:24:18 UTC 2015
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 2d662ebc6ac903d3ecf2e9d1abec02a2feabab29
Author: Torsten Werner <twerner at debian.org>
Date: Sun May 16 11:51:32 2010 +0000
* Convert patches to dep3 format.
* Add a patch to fall back to version 'debian' of plexus-utils if loading of
version '1.1' fails.
---
debian/changelog | 8 ++++++
...port.patch => 0001-remove-webdav-support.patch} | 11 ++++++++
...ons.patch => 0002-update-plugin-versions.patch} | 23 ++++++++++++-----
...ll-back-to-debian-version-of-plexus-utils.patch | 30 ++++++++++++++++++++++
debian/patches/series | 5 ++--
5 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f9b6def..5aea66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven2-core (2.2.1-3) unstable; urgency=low
+
+ * Convert patches to dep3 format.
+ * Add a patch to fall back to version 'debian' of plexus-utils if loading of
+ version '1.1' fails.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 16 May 2010 13:25:34 +0200
+
maven2-core (2.2.1-2) unstable; urgency=low
* Team upload.
diff --git a/debian/patches/remove_webdav_support.patch b/debian/patches/0001-remove-webdav-support.patch
similarity index 61%
rename from debian/patches/remove_webdav_support.patch
rename to debian/patches/0001-remove-webdav-support.patch
index 96af78a..8ba6d0b 100644
--- a/debian/patches/remove_webdav_support.patch
+++ b/debian/patches/0001-remove-webdav-support.patch
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 16 May 2010 13:21:17 +0200
+Subject: [PATCH] remove webdav support
+
+---
+ maven-core/pom.xml | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/maven-core/pom.xml b/maven-core/pom.xml
+index e1bcb30..07b0ab6 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -62,6 +62,7 @@
@@ -16,3 +26,4 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
+--
diff --git a/debian/patches/plugin-versions.patch b/debian/patches/0002-update-plugin-versions.patch
similarity index 77%
rename from debian/patches/plugin-versions.patch
rename to debian/patches/0002-update-plugin-versions.patch
index 704095a..f9013d6 100644
--- a/debian/patches/plugin-versions.patch
+++ b/debian/patches/0002-update-plugin-versions.patch
@@ -1,6 +1,16 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 16 May 2010 13:21:19 +0200
+Subject: [PATCH] update plugin versions
+
+---
+ .../org/apache/maven/project/pom-4.0.0.xml | 20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+index 00e84c1..1a036e7 100644
--- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-@@ -76,11 +76,11 @@
+@@ -76,11 +76,11 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -14,7 +24,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -23,7 +33,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
-@@ -96,15 +96,15 @@
+@@ -96,15 +96,15 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
@@ -42,7 +52,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
-@@ -112,11 +112,11 @@
+@@ -112,11 +112,11 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -56,7 +66,7 @@
</plugin>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
@@ -65,7 +75,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
@@ -74,3 +84,4 @@
</plugin>
</plugins>
</pluginManagement>
+--
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
new file mode 100644
index 0000000..5b56282
--- /dev/null
+++ b/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch
@@ -0,0 +1,30 @@
+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/series b/debian/patches/series
index bd0ac8e..10721ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-remove_webdav_support.patch
-plugin-versions.patch
+0001-remove-webdav-support.patch
+0002-update-plugin-versions.patch
+0003-fall-back-to-debian-version-of-plexus-utils.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2-core.git
More information about the pkg-java-commits
mailing list