diff -Nru jboss-jdeparser2-2.0.2/debian/changelog jboss-jdeparser2-2.0.2/debian/changelog --- jboss-jdeparser2-2.0.2/debian/changelog 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/changelog 2019-02-26 16:37:33.000000000 +0000 @@ -1,3 +1,15 @@ +jboss-jdeparser2 (2.0.2-2~18.04) bionic; urgency=medium + + * Backport for OpenJDK 11. LP: #1814133. + + -- Matthias Klose Tue, 26 Feb 2019 17:37:33 +0100 + +jboss-jdeparser2 (2.0.2-2) unstable; urgency=medium + + * Fix FTBFS with Java 11. (Closes: #912295) + + -- Markus Koschany Tue, 30 Oct 2018 19:57:40 +0100 + jboss-jdeparser2 (2.0.2-1) unstable; urgency=medium * Imported Upstream version 2.0.2. diff -Nru jboss-jdeparser2-2.0.2/debian/compat jboss-jdeparser2-2.0.2/debian/compat --- jboss-jdeparser2-2.0.2/debian/compat 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/compat 2018-10-30 18:57:40.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru jboss-jdeparser2-2.0.2/debian/control jboss-jdeparser2-2.0.2/debian/control --- jboss-jdeparser2-2.0.2/debian/control 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/control 2018-10-30 18:57:40.000000000 +0000 @@ -5,13 +5,13 @@ Uploaders: Markus Koschany Build-Depends: - debhelper (>= 9), + debhelper (>= 11), default-jdk, default-jdk-doc, junit4, libmaven-javadoc-plugin-java, maven-debian-helper (>= 1.5) -Standards-Version: 3.9.8 +Standards-Version: 4.2.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jboss-jdeparser2.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jboss-jdeparser2.git Homepage: https://github.com/jdeparser/jdeparser2 diff -Nru jboss-jdeparser2-2.0.2/debian/copyright jboss-jdeparser2-2.0.2/debian/copyright --- jboss-jdeparser2-2.0.2/debian/copyright 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/copyright 2018-10-30 18:57:40.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: jdeparser2 Source: https://github.com/jdeparser/jdeparser2 Comment: @@ -10,7 +10,7 @@ License: Apache-2.0 Files: debian/* -Copyright: 2015-2016, Markus Koschany +Copyright: 2015-2018, Markus Koschany License: Apache-2.0 License: Apache-2.0 diff -Nru jboss-jdeparser2-2.0.2/debian/patches/disable-apiviz-plugin.patch jboss-jdeparser2-2.0.2/debian/patches/disable-apiviz-plugin.patch --- jboss-jdeparser2-2.0.2/debian/patches/disable-apiviz-plugin.patch 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/patches/disable-apiviz-plugin.patch 2018-10-30 18:57:40.000000000 +0000 @@ -8,7 +8,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml -index 2e60967..c3c259f 100644 +index e5ac693..3d2e2ea 100644 --- a/pom.xml +++ b/pom.xml @@ -49,14 +49,14 @@ diff -Nru jboss-jdeparser2-2.0.2/debian/patches/java11.patch jboss-jdeparser2-2.0.2/debian/patches/java11.patch --- jboss-jdeparser2-2.0.2/debian/patches/java11.patch 1970-01-01 00:00:00.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/patches/java11.patch 2018-10-30 18:57:40.000000000 +0000 @@ -0,0 +1,32 @@ +From: Markus Koschany +Date: Tue, 30 Oct 2018 19:56:37 +0100 +Subject: java11 + +Work around FTBFS with Java 11. +Debian-Bug: https://bugs.debian.org/912295 +Forwarded: no +--- + src/main/java/org/jboss/jdeparser/Assertions.java | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/main/java/org/jboss/jdeparser/Assertions.java b/src/main/java/org/jboss/jdeparser/Assertions.java +index 017c645..29f053c 100644 +--- a/src/main/java/org/jboss/jdeparser/Assertions.java ++++ b/src/main/java/org/jboss/jdeparser/Assertions.java +@@ -18,15 +18,13 @@ + + package org.jboss.jdeparser; + +-import sun.reflect.Reflection; +- + /** + * @author David M. Lloyd + */ + class Assertions { + static boolean callerIs(Class clazz) { + try { +- return Reflection.getCallerClass(3) == clazz; ++ return true; + } catch (Throwable ignored) {} + // dunno + return true; diff -Nru jboss-jdeparser2-2.0.2/debian/patches/series jboss-jdeparser2-2.0.2/debian/patches/series --- jboss-jdeparser2-2.0.2/debian/patches/series 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/patches/series 2018-10-30 18:57:40.000000000 +0000 @@ -1 +1,2 @@ disable-apiviz-plugin.patch +java11.patch diff -Nru jboss-jdeparser2-2.0.2/debian/rules jboss-jdeparser2-2.0.2/debian/rules --- jboss-jdeparser2-2.0.2/debian/rules 2016-04-20 06:10:32.000000000 +0000 +++ jboss-jdeparser2-2.0.2/debian/rules 2018-10-30 18:57:40.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --parallel --buildsystem=maven + dh $@ --buildsystem=maven get-orig-source: uscan --verbose --download-current-version --force-download