[pkg-java] r12429 - in trunk/maven2-core/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Sun May 16 11:51:33 UTC 2010
Author: twerner
Date: 2010-05-16 11:51:32 +0000 (Sun, 16 May 2010)
New Revision: 12429
Added:
trunk/maven2-core/debian/patches/0001-remove-webdav-support.patch
trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch
trunk/maven2-core/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch
Removed:
trunk/maven2-core/debian/patches/plugin-versions.patch
trunk/maven2-core/debian/patches/remove_webdav_support.patch
Modified:
trunk/maven2-core/debian/changelog
trunk/maven2-core/debian/patches/series
Log:
* Convert patches to dep3 format.
* Add a patch to fall back to version 'debian' of plexus-utils if loading of
version '1.1' fails.
Modified: trunk/maven2-core/debian/changelog
===================================================================
--- trunk/maven2-core/debian/changelog 2010-05-16 10:50:55 UTC (rev 12428)
+++ trunk/maven2-core/debian/changelog 2010-05-16 11:51:32 UTC (rev 12429)
@@ -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.
Added: trunk/maven2-core/debian/patches/0001-remove-webdav-support.patch
===================================================================
--- trunk/maven2-core/debian/patches/0001-remove-webdav-support.patch (rev 0)
+++ trunk/maven2-core/debian/patches/0001-remove-webdav-support.patch 2010-05-16 11:51:32 UTC (rev 12429)
@@ -0,0 +1,29 @@
+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 @@
+ </exclusion>
+ </exclusions>
+ </dependency>
++<!-- Removed as jackrabbit depends on JSR 170 which has a non free license
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+@@ -73,6 +74,7 @@
+ </exclusion>
+ </exclusions>
+ </dependency>
++-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+--
Added: trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch
===================================================================
--- trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch (rev 0)
+++ trunk/maven2-core/debian/patches/0002-update-plugin-versions.patch 2010-05-16 11:51:32 UTC (rev 12429)
@@ -0,0 +1,87 @@
+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 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+- <version>2.2-beta-2</version>
++ <version>2.2-beta-4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+- <version>2.2</version>
++ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+@@ -88,7 +88,7 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+- <version>2.0</version>
++ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+@@ -96,15 +96,15 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+- <version>2.3.1</version>
++ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+- <version>2.1</version>
++ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+- <version>2.2</version>
++ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+@@ -112,11 +112,11 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.5</version>
++ <version>2.6.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+- <version>2.4.3</version>
++ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-rar-plugin</artifactId>
+@@ -132,7 +132,7 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+- <version>2.0-beta-7</version>
++ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+@@ -144,7 +144,7 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+- <version>2.1-alpha-2</version>
++ <version>2.1-beta-1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+--
Added: 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 (rev 0)
+++ trunk/maven2-core/debian/patches/0003-fall-back-to-debian-version-of-plexus-utils.patch 2010-05-16 11:51:32 UTC (rev 12429)
@@ -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;
+ }
+--
Deleted: trunk/maven2-core/debian/patches/plugin-versions.patch
===================================================================
--- trunk/maven2-core/debian/patches/plugin-versions.patch 2010-05-16 10:50:55 UTC (rev 12428)
+++ trunk/maven2-core/debian/patches/plugin-versions.patch 2010-05-16 11:51:32 UTC (rev 12429)
@@ -1,76 +0,0 @@
---- 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 @@
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-- <version>2.2-beta-2</version>
-+ <version>2.2-beta-4</version>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
-- <version>2.2</version>
-+ <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
-@@ -88,7 +88,7 @@
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
-- <version>2.0</version>
-+ <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
-@@ -96,15 +96,15 @@
- </plugin>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
-- <version>2.3.1</version>
-+ <version>2.3.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
-- <version>2.1</version>
-+ <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
-- <version>2.2</version>
-+ <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
-@@ -112,11 +112,11 @@
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
-- <version>2.5</version>
-+ <version>2.6.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
-- <version>2.4.3</version>
-+ <version>2.5</version>
- </plugin>
- <plugin>
- <artifactId>maven-rar-plugin</artifactId>
-@@ -132,7 +132,7 @@
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
-- <version>2.0-beta-7</version>
-+ <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
-@@ -144,7 +144,7 @@
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
-- <version>2.1-alpha-2</version>
-+ <version>2.1-beta-1</version>
- </plugin>
- </plugins>
- </pluginManagement>
Deleted: trunk/maven2-core/debian/patches/remove_webdav_support.patch
===================================================================
--- trunk/maven2-core/debian/patches/remove_webdav_support.patch 2010-05-16 10:50:55 UTC (rev 12428)
+++ trunk/maven2-core/debian/patches/remove_webdav_support.patch 2010-05-16 11:51:32 UTC (rev 12429)
@@ -1,18 +0,0 @@
---- a/maven-core/pom.xml
-+++ b/maven-core/pom.xml
-@@ -62,6 +62,7 @@
- </exclusion>
- </exclusions>
- </dependency>
-+<!-- Removed as jackrabbit depends on JSR 170 which has a non free license
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
-@@ -73,6 +74,7 @@
- </exclusion>
- </exclusions>
- </dependency>
-+-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
Modified: trunk/maven2-core/debian/patches/series
===================================================================
--- trunk/maven2-core/debian/patches/series 2010-05-16 10:50:55 UTC (rev 12428)
+++ trunk/maven2-core/debian/patches/series 2010-05-16 11:51:32 UTC (rev 12429)
@@ -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
More information about the pkg-java-commits
mailing list