Tony Mancill pushed to branch master at Debian Java Maintainers / istack-commons
Commits: 92e81dc0 by tony mancill at 2019-07-10T03:18:13Z Fix FTBFS test failure with JDK 11.0.4-ea (due to version string) - - - - - 1a0aacce by tony mancill at 2019-07-10T03:18:28Z interim changelog - - - - - c799feb1 by tony mancill at 2019-07-10T03:21:05Z Bump Standards-Version to 4.4.0 - - - - - c22f7772 by tony mancill at 2019-07-10T03:28:13Z prepare changelog for upload to unstable - - - - - 983b719e by tony mancill at 2019-07-10T03:34:24Z add DEP3 header to patch 03 - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/03-java-version-parsing.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +istack-commons (3.0.6-4) unstable; urgency=medium + + * Team upload. + * Fix FTBFS test failure with JDK 11.0.4-ea (due to version string) + * Bump Standards-Version to 4.4.0 + + -- tony mancill <[email protected]> Tue, 09 Jul 2019 20:27:16 -0700 + istack-commons (3.0.6-3) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -26,7 +26,7 @@ Build-Depends: libwagon-http-java, maven-debian-helper (>= 2.2), testng (>= 6) -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Vcs-Git: https://salsa.debian.org/java-team/istack-commons.git Vcs-Browser: https://salsa.debian.org/java-team/istack-commons Homepage: https://javaee.github.io/jaxb-istack-commons/ ===================================== debian/patches/03-java-version-parsing.patch ===================================== @@ -0,0 +1,20 @@ +Description: Parses java.version system property by simply looking at + the whole number. This should still work for a >= JDK9 test, since + java.version strings for JDK8 and earlier will parse to 1 < 9. +Author: tony mancill <[email protected]> +Forwarded: no + +--- a/istack-commons/tools/src/test/java/com/sun/istack/tools/ParallelWorldClassLoaderTest.java ++++ b/istack-commons/tools/src/test/java/com/sun/istack/tools/ParallelWorldClassLoaderTest.java +@@ -143,9 +143,9 @@ + + private static boolean isJDK9() { + String ver = System.getProperty("java.version"); +- int idx = ver.indexOf('-'); ++ //int idx = ver.indexOf('-'); + int idx2 = ver.indexOf('.', 1); +- float v = Float.parseFloat(idx > 0 ? ver.substring(0, idx) : idx2 > 0 ? ver.substring(0, idx2) : ver); ++ float v = Float.parseFloat(idx2 > 0 ? ver.substring(0, idx2) : ver); + return v > 8; + } + } ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 01-activation-dependency.patch 02-disable-atgenerated-annotation-by-default.patch +03-java-version-parsing.patch View it on GitLab: https://salsa.debian.org/java-team/istack-commons/compare/9e1c4cd11961dac8ce274933e7eed1256e850c18...983b719ecbad396842d3f8765ce74729e2e269c6 -- View it on GitLab: https://salsa.debian.org/java-team/istack-commons/compare/9e1c4cd11961dac8ce274933e7eed1256e850c18...983b719ecbad396842d3f8765ce74729e2e269c6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

