This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gs-collections.
commit 083c0244ab02be90283170e449c4fc05ed88b6cc Author: Emmanuel Bourg <[email protected]> Date: Tue Dec 15 15:17:48 2015 +0100 Removed the patches no longer required with Maven 3 --- debian/changelog | 1 + debian/patches/01-maven2-compatibility.patch | 113 ---------------------- debian/patches/04-compile-generated-sources.patch | 87 ----------------- debian/patches/series | 3 - 4 files changed, 1 insertion(+), 203 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c512ac..4b2df88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gs-collections (5.1.0-2) UNRELEASED; urgency=medium * Fixed the build failure with Maven 3 (Closes: #808022) + * Removed the patches no longer required with Maven 3 -- Emmanuel Bourg <[email protected]> Tue, 15 Dec 2015 15:06:52 +0100 diff --git a/debian/patches/01-maven2-compatibility.patch b/debian/patches/01-maven2-compatibility.patch deleted file mode 100644 index 667f23c..0000000 --- a/debian/patches/01-maven2-compatibility.patch +++ /dev/null @@ -1,113 +0,0 @@ -Description: Remove the prerequisite on Maven 3 -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/collections-api/pom.xml -+++ b/collections-api/pom.xml -@@ -81,7 +81,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/collections/pom.xml -+++ b/collections/pom.xml -@@ -82,7 +82,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/gs-collections-forkjoin/pom.xml -+++ b/gs-collections-forkjoin/pom.xml -@@ -82,7 +82,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/pom.xml -+++ b/pom.xml -@@ -100,7 +100,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencyManagement> ---- a/gs-collections-code-generator/pom.xml -+++ b/gs-collections-code-generator/pom.xml -@@ -38,7 +38,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/gs-collections-code-generator-maven-plugin/pom.xml -+++ b/gs-collections-code-generator-maven-plugin/pom.xml -@@ -39,7 +39,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/collections-testutils/pom.xml -+++ b/collections-testutils/pom.xml -@@ -82,7 +82,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/acceptance-tests/pom.xml -+++ b/acceptance-tests/pom.xml -@@ -36,7 +36,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/unit-tests/pom.xml -+++ b/unit-tests/pom.xml -@@ -36,7 +36,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> ---- a/serialization-tests/pom.xml -+++ b/serialization-tests/pom.xml -@@ -36,7 +36,7 @@ - </properties> - - <prerequisites> -- <maven>3.0</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <dependencies> diff --git a/debian/patches/04-compile-generated-sources.patch b/debian/patches/04-compile-generated-sources.patch deleted file mode 100644 index e379912..0000000 --- a/debian/patches/04-compile-generated-sources.patch +++ /dev/null @@ -1,87 +0,0 @@ -Description: Force the compilation of the generated sources. For some reason they - aren't automatically compiled by Maven (the plugin does add the - target/generated-sources/java directory to the source path though). The workaround - consists in invoking the build-helper-maven-plugin to add the directory manually. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/collections-api/pom.xml -+++ b/collections-api/pom.xml -@@ -233,6 +233,24 @@ - </plugin> - - <plugin> -+ <groupId>org.codehaus.mojo</groupId> -+ <artifactId>build-helper-maven-plugin</artifactId> -+ <executions> -+ <execution> -+ <phase>generate-sources</phase> -+ <goals> -+ <goal>add-source</goal> -+ </goals> -+ <configuration> -+ <sources> -+ <source>${project.build.directory}/generated-sources/java</source> -+ </sources> -+ </configuration> -+ </execution> -+ </executions> -+ </plugin> -+ -+ <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> ---- a/collections/pom.xml -+++ b/collections/pom.xml -@@ -241,6 +241,24 @@ - </plugin> - - <plugin> -+ <groupId>org.codehaus.mojo</groupId> -+ <artifactId>build-helper-maven-plugin</artifactId> -+ <executions> -+ <execution> -+ <phase>generate-sources</phase> -+ <goals> -+ <goal>add-source</goal> -+ </goals> -+ <configuration> -+ <sources> -+ <source>${project.build.directory}/generated-sources/java</source> -+ </sources> -+ </configuration> -+ </execution> -+ </executions> -+ </plugin> -+ -+ <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> ---- a/unit-tests/pom.xml -+++ b/unit-tests/pom.xml -@@ -115,6 +115,24 @@ - </plugin> - - <plugin> -+ <groupId>org.codehaus.mojo</groupId> -+ <artifactId>build-helper-maven-plugin</artifactId> -+ <executions> -+ <execution> -+ <phase>generate-test-sources</phase> -+ <goals> -+ <goal>add-test-source</goal> -+ </goals> -+ <configuration> -+ <sources> -+ <source>${project.build.directory}/generated-test-sources/java</source> -+ </sources> -+ </configuration> -+ </execution> -+ </executions> -+ </plugin> -+ -+ <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> diff --git a/debian/patches/series b/debian/patches/series index ad652cf..b931373 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -01-maven2-compatibility.patch -#03-jar-packaging.patch 03-bundle-dependencies.patch -04-compile-generated-sources.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gs-collections.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
