Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-modules
Commits: 445969d6 by Markus Koschany at 2018-10-30T21:45:48Z Add java11.patch - - - - - 2705da56 by Markus Koschany at 2018-10-30T21:46:32Z Update changelog - - - - - 4 changed files: - debian/changelog - debian/patches/invalid-release-flag.patch - + debian/patches/java11.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +jboss-modules (1.8.6-2) unstable; urgency=medium + + * Add java11.patch and work around FTBFS with OpenJDK 11. (Closes: #912296) + + -- Markus Koschany <[email protected]> Tue, 30 Oct 2018 22:46:04 +0100 + jboss-modules (1.8.6-1) unstable; urgency=medium * New upstream version 1.8.6. ===================================== debian/patches/invalid-release-flag.patch ===================================== @@ -8,7 +8,7 @@ Work around a FTBFS due to "invalid release flag". 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml -index 7a5ab95..ae730a4 100644 +index 11506bf..393a575 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,6 @@ ===================================== debian/patches/java11.patch ===================================== @@ -0,0 +1,46 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 30 Oct 2018 22:39:28 +0100 +Subject: java11 + +Ugly workaround for removed sun.reflect.Reflection class. Fixes FTBFS with +OpenJDK 11 though... + +Bug-Debian: https://bugs.debian.org/912296 +Forwarded: no +--- + src/main/java/org/jboss/modules/JDKSpecific.java | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/main/java/org/jboss/modules/JDKSpecific.java b/src/main/java/org/jboss/modules/JDKSpecific.java +index 666c3b7..3d89a6f 100644 +--- a/src/main/java/org/jboss/modules/JDKSpecific.java ++++ b/src/main/java/org/jboss/modules/JDKSpecific.java +@@ -34,7 +34,6 @@ import java.util.List; + import java.util.Set; + import java.util.jar.JarFile; + +-import sun.reflect.Reflection; + + /** + * JDK-specific classes which are replaced for different JDK major versions. This one is for Java 8 only. +@@ -82,9 +81,9 @@ final class JDKSpecific { + int offset = 0; + try { + //noinspection deprecation +- result = Reflection.getCallerClass(1) == JDKSpecific.class || Reflection.getCallerClass(2) == JDKSpecific.class; ++ result = false; + //noinspection deprecation +- offset = Reflection.getCallerClass(1) == Reflection.class ? 2 : 1; ++ offset = 0; + + } catch (Throwable ignored) {} + hasGetCallerClass = result; +@@ -117,7 +116,7 @@ final class JDKSpecific { + // 1 == immediate caller in jboss-modules + // 2 == user caller + if (hasGetCallerClass) { +- return Reflection.getCallerClass(2 + callerOffset); ++ return null; + } else { + return hack.getClassContext()[2 + callerOffset]; + } ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ invalid-release-flag.patch no-ModuleIteratorTest.patch +java11.patch View it on GitLab: https://salsa.debian.org/java-team/jboss-modules/compare/6f7916eaccce073d36861a1613eedce28da5b9ea...2705da56ec52189b65c5813587bb121ffd96454d -- View it on GitLab: https://salsa.debian.org/java-team/jboss-modules/compare/6f7916eaccce073d36861a1613eedce28da5b9ea...2705da56ec52189b65c5813587bb121ffd96454d 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
