This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipse-jgit.
commit 6f265ba56b300b40cbfc3e4efc910bb5f7b45b58 Author: Emmanuel Bourg <[email protected]> Date: Tue May 13 12:49:46 2014 +0200 Fixed a test failure with Java 8 --- debian/changelog | 3 +- debian/patches/java8-compatibility.patch | 60 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 685826e..f163111 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -jgit (3.3.2-1) UNRELEASED; urgency=medium +jgit (3.3.2-1) unstable; urgency=medium * Team upload. * New Upstream release. - Refreshed the patches + * Fixed a test failure with Java 8 -- Emmanuel Bourg <[email protected]> Tue, 13 May 2014 10:36:22 +0200 diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch new file mode 100644 index 0000000..93488db --- /dev/null +++ b/debian/patches/java8-compatibility.patch @@ -0,0 +1,60 @@ +Description: Fixes the test failures with Java 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=20fc10 + http://git.eclipse.org/c/jgit/jgit.git/commit/?id=bb9a48 +--- a/org.eclipse.jgit.pgm.test/pom.xml ++++ b/org.eclipse.jgit.pgm.test/pom.xml +@@ -64,7 +64,7 @@ + <profile> + <id>jgit.java7</id> + <activation> +- <jdk>1.7</jdk> ++ <jdk>[1.7,)</jdk> + </activation> + <dependencies> + <dependency> +--- a/org.eclipse.jgit.pgm/pom.xml ++++ b/org.eclipse.jgit.pgm/pom.xml +@@ -112,7 +112,7 @@ + <profile> + <id>java7</id> + <activation> +- <jdk>1.7</jdk> ++ <jdk>[1.7,)</jdk> + </activation> + <dependencies> + <dependency> +--- a/org.eclipse.jgit.test/pom.xml ++++ b/org.eclipse.jgit.test/pom.xml +@@ -66,7 +66,7 @@ + <profile> + <id>jgit.java7</id> + <activation> +- <jdk>1.7</jdk> ++ <jdk>[1.7,)</jdk> + </activation> + <dependencies> + <dependency> +--- a/pom.xml ++++ b/pom.xml +@@ -504,7 +504,7 @@ + <profile> + <id>jgit.java6</id> + <activation> +- <jdk>1.6</jdk> ++ <jdk>[1.6,)</jdk> + </activation> + <modules> + <module>org.eclipse.jgit.console</module> +@@ -513,10 +513,9 @@ + <profile> + <id>jgit.java7</id> + <activation> +- <jdk>1.7</jdk> ++ <jdk>[1.7,)</jdk> + </activation> + <modules> +- <module>org.eclipse.jgit.console</module> + <module>org.eclipse.jgit.java7</module> + <!--module>org.eclipse.jgit.java7.test</module--> + </modules> diff --git a/debian/patches/series b/debian/patches/series index 5beecbc..08f8f24 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ debian-custom-build.patch ftbfs-args4j-2.0.25-fix.patch unversioned-orbit-dependencies.patch fix-jgit-pgm-test-dependencies.patch +java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
