[Git][java-team/jboss-jdeparser2][master] 6 commits: Switch to compat level 11.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-jdeparser2


Commits:
f588b60a by Markus Koschany at 2018-10-30T18:38:45Z
Switch to compat level 11.

- - - - -
2b9754e3 by Markus Koschany at 2018-10-30T18:39:11Z
Update d/copyright

- - - - -
d96b97de by Markus Koschany at 2018-10-30T18:44:17Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
840d8c29 by Markus Koschany at 2018-10-30T18:44:35Z
Start new changelog entry.

- - - - -
a1a48ba8 by Markus Koschany at 2018-10-30T18:57:22Z
Fix FTBFS with Java 11.

Closes: #912295

- - - - -
dcc7d2eb by Markus Koschany at 2018-10-30T18:57:54Z
Update changelog

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/patches/disable-apiviz-plugin.patch
- + debian/patches/java11.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+jboss-jdeparser2 (2.0.2-2) unstable; urgency=medium
+
+  * Fix FTBFS with Java 11. (Closes: #912295)
+
+ -- Markus Koschany <apo at debian.org>  Tue, 30 Oct 2018 19:57:40 +0100
+
 jboss-jdeparser2 (2.0.2-1) unstable; urgency=medium
 
   * Imported Upstream version 2.0.2.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
@@ -5,13 +5,13 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo at debian.org>
 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


=====================================
debian/copyright
=====================================
@@ -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 @@ Copyright: 2015-2016, Red Hat, Inc.
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2015-2016, Markus Koschany <apo at gambaru.de>
+Copyright: 2015-2018, Markus Koschany <apo at gambaru.de>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/patches/disable-apiviz-plugin.patch
=====================================
@@ -8,7 +8,7 @@ Forwarded: not-needed
  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 @@


=====================================
debian/patches/java11.patch
=====================================
@@ -0,0 +1,32 @@
+From: Markus Koschany <apo at debian.org>
+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 <a href="mailto:david.lloyd at redhat.com">David M. Lloyd</a>
+  */
+ class Assertions {
+     static boolean callerIs(Class<?> clazz) {
+         try {
+-            return Reflection.getCallerClass(3) == clazz;
++            return true;
+         } catch (Throwable ignored) {}
+         // dunno
+         return true;


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 disable-apiviz-plugin.patch
+java11.patch


=====================================
debian/rules
=====================================
@@ -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



View it on GitLab: https://salsa.debian.org/java-team/jboss-jdeparser2/compare/383113513543e752a7b7336c29b0ad977d7c76dc...dcc7d2eb8f510b6d2a75c6e327b10d6fba8c1230

-- 
View it on GitLab: https://salsa.debian.org/java-team/jboss-jdeparser2/compare/383113513543e752a7b7336c29b0ad977d7c76dc...dcc7d2eb8f510b6d2a75c6e327b10d6fba8c1230
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181030/c0268aef/attachment.html>