The following commit has been merged in the master branch: commit 6573c5a4bbcdea52534ef38bcb5b68e5a05444e8 Author: Ludovic Claude <ludovic.cla...@laposte.net> Date: Tue Jan 3 20:04:14 2012 +0100
Remove old patches diff --git a/debian/patches/0001-add-version-1.5.5-to-dependency-plexus-util.patch b/debian/patches/0001-add-version-1.5.5-to-dependency-plexus-util.patch deleted file mode 100644 index 2d1c5bc..0000000 --- a/debian/patches/0001-add-version-1.5.5-to-dependency-plexus-util.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Torsten Werner <twer...@debian.org> -Date: Thu, 25 Aug 2011 23:38:12 +0200 -Subject: [PATCH] add version 1.5.5 to dependency plexus-util - -Otherwise Maven failes to validate some POMs. ---- - pom.xml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/pom.xml b/pom.xml -index e1f7185..b2a8181 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -40,6 +40,11 @@ - <artifactId>plexus-compiler-test</artifactId> - <version>${project.version}</version> - </dependency> -+ <dependency> -+ <groupId>org.codehaus.plexus</groupId> -+ <artifactId>plexus-utils</artifactId> -+ <version>1.5.5</version> -+ </dependency> - </dependencies> - </dependencyManagement> - <dependencies> --- diff --git a/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch b/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch deleted file mode 100644 index cedcc0d..0000000 --- a/debian/patches/0002-add-version-3.8.2-to-dependency-junit.patch +++ /dev/null @@ -1,133 +0,0 @@ -Index: b/plexus-compiler-api/pom.xml -=================================================================== ---- a/plexus-compiler-api/pom.xml -+++ b/plexus-compiler-api/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-api</artifactId> -Index: b/plexus-compiler-manager/pom.xml -=================================================================== ---- a/plexus-compiler-manager/pom.xml -+++ b/plexus-compiler-manager/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-manager</artifactId> -Index: b/plexus-compiler-test/pom.xml -=================================================================== ---- a/plexus-compiler-test/pom.xml -+++ b/plexus-compiler-test/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-test</artifactId> -Index: b/plexus-compilers/plexus-compiler-aspectj/pom.xml -=================================================================== ---- a/plexus-compilers/plexus-compiler-aspectj/pom.xml -+++ b/plexus-compilers/plexus-compiler-aspectj/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compilers</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-aspectj</artifactId> -Index: b/plexus-compilers/plexus-compiler-csharp/pom.xml -=================================================================== ---- a/plexus-compilers/plexus-compiler-csharp/pom.xml -+++ b/plexus-compilers/plexus-compiler-csharp/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compilers</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-csharp</artifactId> -Index: b/plexus-compilers/plexus-compiler-eclipse/pom.xml -=================================================================== ---- a/plexus-compilers/plexus-compiler-eclipse/pom.xml -+++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compilers</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-eclipse</artifactId> -Index: b/plexus-compilers/plexus-compiler-javac/pom.xml -=================================================================== ---- a/plexus-compilers/plexus-compiler-javac/pom.xml -+++ b/plexus-compilers/plexus-compiler-javac/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compilers</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-javac</artifactId> -Index: b/plexus-compilers/plexus-compiler-jikes/pom.xml -=================================================================== ---- a/plexus-compilers/plexus-compiler-jikes/pom.xml -+++ b/plexus-compilers/plexus-compiler-jikes/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compilers</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>plexus-compiler-jikes</artifactId> -Index: b/plexus-compilers/pom.xml -=================================================================== ---- a/plexus-compilers/pom.xml -+++ b/plexus-compilers/pom.xml -@@ -6,6 +6,7 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler</artifactId> - <version>1.6</version> -+ <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.codehaus.plexus</groupId> -Index: b/pom.xml -=================================================================== ---- a/pom.xml -+++ b/pom.xml -@@ -45,6 +45,12 @@ - <artifactId>plexus-utils</artifactId> - <version>1.5.5</version> - </dependency> -+ <dependency> -+ <groupId>junit</groupId> -+ <artifactId>junit</artifactId> -+ <version>3.8.2</version> -+ <scope>test</scope> -+ </dependency> - </dependencies> - </dependencyManagement> - <dependencies> -@@ -57,7 +63,6 @@ - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> -- <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> diff --git a/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch b/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch deleted file mode 100644 index 29b65bc..0000000 --- a/debian/patches/0003-remove-unbuildable-modules-from-pom.xml.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Torsten Werner <twer...@debian.org> -Date: Fri, 26 Aug 2011 00:05:25 +0200 -Subject: [PATCH] remove unbuildable modules from pom.xml - ---- - plexus-compilers/pom.xml | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -Index: b/plexus-compilers/pom.xml -=================================================================== ---- a/plexus-compilers/pom.xml -+++ b/plexus-compilers/pom.xml -@@ -16,10 +16,7 @@ - <name>Plexus Compilers</name> - - <modules> -- <module>plexus-compiler-aspectj</module> - <module>plexus-compiler-csharp</module> -- <module>plexus-compiler-eclipse</module> -- <module>plexus-compiler-jikes</module> - <module>plexus-compiler-javac</module> - </modules> - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7cd6c75..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-add-version-1.5.5-to-dependency-plexus-util.patch -0002-add-version-3.8.2-to-dependency-junit.patch -0003-remove-unbuildable-modules-from-pom.xml.patch -- Plexus Compiler _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits