Markus Koschany pushed to branch master at Debian Java Maintainers / lombok
Commits: c8563137 by Markus Koschany at 2018-11-08T13:16:13Z Add java11-log-error.patch Closes: #910748 - - - - - 5df6cf90 by Markus Koschany at 2018-11-08T13:17:00Z Update changelog - - - - - 3 changed files: - debian/changelog - + debian/patches/java11-log-error.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,14 @@ -lombok (1.16.22-4) UNRELEASED; urgency=medium +lombok (1.16.22-4) unstable; urgency=medium * Team upload. + + [ Emmanuel Bourg ] * Removed the now unused build dependency on eclipse-platform-data - -- Emmanuel Bourg <[email protected]> Thu, 11 Oct 2018 15:57:03 +0200 + [ Markus Koschany ] + * Add java11-log-error.patch and fix FTBFS with Java 11. (Closes: #910748) + + -- Markus Koschany <[email protected]> Thu, 08 Nov 2018 14:16:26 +0100 lombok (1.16.22-3) unstable; urgency=medium ===================================== debian/patches/java11-log-error.patch ===================================== @@ -0,0 +1,61 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 8 Nov 2018 14:12:11 +0100 +Subject: java11-log-error + +Some methods were removed in Java 11. + +Bug-Debian: https://bugs.debian.org/910748 +--- + src/core/lombok/javac/JavacAST.java | 32 -------------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/core/lombok/javac/JavacAST.java b/src/core/lombok/javac/JavacAST.java +index acf4b4d..b7f0027 100644 +--- a/src/core/lombok/javac/JavacAST.java ++++ b/src/core/lombok/javac/JavacAST.java +@@ -511,7 +511,6 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> { + break; + } + } +- if (hasMultipleErrors) return new JdkBefore9(log, messager, errorCount); + + Field warningCount = null; + try { +@@ -524,37 +523,6 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> { + } + } + +- static class JdkBefore9 extends ErrorLog { +- private JdkBefore9(Log log, Messager messager, Field errorCount) { +- super(log, messager, errorCount, null); +- } +- +- @Override void error1(DiagnosticPosition pos, String message) { +- try { +- Field multipleErrorsField = log.getClass().getField("multipleErrors"); +- boolean prev = multipleErrorsField.getBoolean(log); +- multipleErrorsField.setBoolean(log, true); +- try { +- log.error(pos, "proc.messager", message); +- } finally { +- multipleErrorsField.setBoolean(log, prev); +- } +- } catch (Throwable t) {} +- } +- +- @Override void warning1(DiagnosticPosition pos, String message) { +- log.warning(pos, "proc.messager", message); +- } +- +- @Override void mandatoryWarning1(DiagnosticPosition pos, String message) { +- log.mandatoryWarning(pos, "proc.messager", message); +- } +- +- @Override void note(DiagnosticPosition pos, String message) { +- log.note(pos, "proc.messager", message); +- } +- } +- + static class Jdk9Plus extends ErrorLog { + private static final String PROC_MESSAGER = "proc.messager"; + private Object multiple; ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ build.patch java9-compatibility.patch disable-java6-and-java7-support.patch remove-j9stub.patch +java11-log-error.patch View it on GitLab: https://salsa.debian.org/java-team/lombok/compare/5553cf425044a084e148ed4b7b26ed6fedab287c...5df6cf90e85894f225229a710550a50f42f4d898 -- View it on GitLab: https://salsa.debian.org/java-team/lombok/compare/5553cf425044a084e148ed4b7b26ed6fedab287c...5df6cf90e85894f225229a710550a50f42f4d898 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
