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 1429b1a2bdd73981f13c80b3585c622f7657d934 Author: Emmanuel Bourg <[email protected]> Date: Tue Dec 15 15:16:26 2015 +0100 Fixed the build failure with Maven 3 (Closes: #808022) --- debian/changelog | 6 +++ .../02-use-default-maven-bundle-plugin.patch | 43 ---------------------- debian/patches/series | 1 - 3 files changed, 6 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8573229..9c512ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gs-collections (5.1.0-2) UNRELEASED; urgency=medium + + * Fixed the build failure with Maven 3 (Closes: #808022) + + -- Emmanuel Bourg <[email protected]> Tue, 15 Dec 2015 15:06:52 +0100 + gs-collections (5.1.0-1) unstable; urgency=medium * Initial release (Closes: #793337) diff --git a/debian/patches/02-use-default-maven-bundle-plugin.patch b/debian/patches/02-use-default-maven-bundle-plugin.patch deleted file mode 100644 index 86148a4..0000000 --- a/debian/patches/02-use-default-maven-bundle-plugin.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Use the default maven-bundle-plugin available in Debian -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/collections-api/pom.xml -+++ b/collections-api/pom.xml -@@ -186,7 +186,6 @@ - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> -- <version>2.4.0</version> - </plugin> - - <plugin> ---- a/collections/pom.xml -+++ b/collections/pom.xml -@@ -193,7 +193,6 @@ - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> -- <version>2.4.0</version> - </plugin> - - <plugin> ---- a/gs-collections-forkjoin/pom.xml -+++ b/gs-collections-forkjoin/pom.xml -@@ -206,7 +206,6 @@ - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> -- <version>2.4.0</version> - </plugin> - - <plugin> ---- a/pom.xml -+++ b/pom.xml -@@ -245,7 +245,6 @@ - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> -- <version>2.4.0</version> - </plugin> - - <plugin> diff --git a/debian/patches/series b/debian/patches/series index 7319376..ad652cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 01-maven2-compatibility.patch -02-use-default-maven-bundle-plugin.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
