Emmanuel Bourg pushed to branch master at Debian Java Maintainers / logback
Commits: 27d8c629 by Emmanuel Bourg at 2018-11-10T23:36:56Z Standards-Version updated to 4.2.1 - - - - - a4c97d95 by Emmanuel Bourg at 2018-11-10T23:37:34Z Switch to debhelper level 11 - - - - - c37335fa by Emmanuel Bourg at 2018-11-10T23:37:45Z Use salsa.debian.org Vcs-* URLs - - - - - ec1a6e7f by Emmanuel Bourg at 2018-11-10T23:38:40Z Wrap and sort - - - - - b3b981cc by Emmanuel Bourg at 2018-11-10T23:40:10Z Removed Damien Raude-Morvan from the uploaders (Closes: #889387) - - - - - 83b54553 by Emmanuel Bourg at 2018-11-11T00:05:57Z Fixed the build failure with Java 11 (Closes: #911183) - - - - - bdb479f8 by Emmanuel Bourg at 2018-11-11T00:10:59Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - + debian/patches/05-java11-compatibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +logback (1:1.2.3-3) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 11 (Closes: #911183) + * Removed Damien Raude-Morvan from the uploaders (Closes: #889387) + * Standards-Version updated to 4.2.1 + * Switch to debhelper level 11 + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg <[email protected]> Sun, 11 Nov 2018 01:10:52 +0100 + logback (1:1.2.3-2) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -2,27 +2,27 @@ Source: logback Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Damien Raude-Morvan <[email protected]>, - tony mancill <[email protected]> -Build-Depends: debhelper (>= 10), - default-jdk, - groovy, - libgeronimo-jms-1.1-spec-java, - libgmavenplus-java, - libjanino-java (>= 2.6.0), - libjansi-java, - libmail-java, - libmaven-antrun-plugin-java, - libmaven-bundle-plugin-java, - libmaven-javadoc-plugin-java, - libservlet3.1-java, - libslf4j-java (>= 1.7.18), - libjetty9-java, - libtomcat8-java, - maven-debian-helper -Standards-Version: 4.1.2 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/logback.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/logback.git +Uploaders: tony mancill <[email protected]> +Build-Depends: + debhelper (>= 11), + default-jdk, + groovy, + libgeronimo-jms-1.1-spec-java, + libgmavenplus-java, + libjanino-java (>= 2.6.0), + libjansi-java, + libjetty9-java, + libmail-java, + libmaven-antrun-plugin-java, + libmaven-bundle-plugin-java, + libmaven-javadoc-plugin-java, + libservlet3.1-java, + libslf4j-java (>= 1.7.18), + libtomcat8-java, + maven-debian-helper +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/java-team/logback.git +Vcs-Browser: https://salsa.debian.org/java-team/logback Homepage: https://logback.qos.ch Package: liblogback-java ===================================== debian/patches/05-java11-compatibility.patch ===================================== @@ -0,0 +1,33 @@ +Description: Fixes the compatibility with Java 11 +Origin: backport, https://github.com/qos-ch/logback/commit/e59b6d6b#diff-0108e2118a460318f4aaa75ac3ca7efe +--- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ++++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java +@@ -17,7 +17,7 @@ + import java.security.CodeSource; + import java.util.HashMap; + +-import sun.reflect.Reflection; ++//import sun.reflect.Reflection; + + // import java.security.AccessControlException; import java.security.AccessController;import java.security.PrivilegedAction; + /** +@@ -42,8 +42,8 @@ + // sun.reflect.Reflection class. However, this class will *not compile* + // on JDKs lacking sun.reflect.Reflection. + try { +- Reflection.getCallerClass(2); +- GET_CALLER_CLASS_METHOD_AVAILABLE = true; ++ //Reflection.getCallerClass(2); ++ //GET_CALLER_CLASS_METHOD_AVAILABLE = true; + } catch (NoClassDefFoundError e) { + } catch (NoSuchMethodError e) { + } catch (UnsupportedOperationException e) { +@@ -82,7 +82,7 @@ + for (int i = 0; i < commonFrames; i++) { + Class callerClass = null; + if (GET_CALLER_CLASS_METHOD_AVAILABLE) { +- callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1); ++ //callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1); + } + StackTraceElementProxy step = stepArray[stepFirstCommon + i]; + String stepClassname = step.ste.getClassName(); ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 02-remove-google-ads.patch 04-privacy-breach.patch +05-java11-compatibility.patch ===================================== debian/rules ===================================== @@ -1,7 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --build-system=maven - -get-orig-source: - uscan --download-current-version --force-download --rename + dh $@ View it on GitLab: https://salsa.debian.org/java-team/logback/compare/85b592ab6436c389c77f3a6195361973e65835a8...bdb479f85d87b8de381cd50f56ab894e862a2e6e -- View it on GitLab: https://salsa.debian.org/java-team/logback/compare/85b592ab6436c389c77f3a6195361973e65835a8...bdb479f85d87b8de381cd50f56ab894e862a2e6e 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
