This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch maintenance-1.2.0 in repository clojure.
commit 7d52a48380245abeb3d1540de9fd52d751e00267 Author: Emmanuel Bourg <[email protected]> Date: Fri May 2 18:19:15 2014 +0200 Fixed the test failures with Java 7 --- debian/changelog | 1 + .../02-fix-annotations-tests-with-java7.patch | 30 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) diff --git a/debian/changelog b/debian/changelog index 89f322d..a7c5714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ clojure1.2 (1.2.1+dfsg-5) UNRELEASED; urgency=medium * Team upload. + * Fixed the test failures with Java 7 (Closes: #717015) * debian/control: - Build depend on default-jdk instead of openjdk-6-jdk - Standards-Version updated to 3.9.5 (no changes) diff --git a/debian/patches/02-fix-annotations-tests-with-java7.patch b/debian/patches/02-fix-annotations-tests-with-java7.patch new file mode 100644 index 0000000..ff81bb0 --- /dev/null +++ b/debian/patches/02-fix-annotations-tests-with-java7.patch @@ -0,0 +1,30 @@ +Description: Fixes the annotations tests with Java 7 + The modified annotations.clj file was taken from clojure1.4 +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/test/clojure/test_clojure/annotations.clj ++++ b/test/clojure/test_clojure/annotations.clj +@@ -11,19 +11,7 @@ + (ns clojure.test-clojure.annotations + (:use clojure.test)) + +-(defn vm-has-ws-annotations? +- "Does the vm have the ws annotations we use to test some +- annotation features. If not, fall back to Java 5 tests." +- [] +- (try +- (doseq [n ["javax.xml.ws.soap.Addressing" +- "javax.xml.ws.WebServiceRef" +- "javax.xml.ws.WebServiceRefs"]] +- (Class/forName n)) +- true +- (catch ClassNotFoundException e +- false))) +- +-(if (vm-has-ws-annotations?) +- (load "annotations/java_6_and_later") +- (load "annotations/java_5")) ++(case (System/getProperty "java.specification.version") ++ "1.5" (load "annotations/java_5") ++ "1.6" (load "annotations/java_6_and_later") ++ nil) diff --git a/debian/patches/series b/debian/patches/series index 63dcdee..e92daf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-replace-asm.patch +02-fix-annotations-tests-with-java7.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/clojure.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
