debian/changelog

+libbtm-java (2.1.4-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 11 (Closes: #911194)
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 07 Nov 2018 01:46:49 +0100
+
 libbtm-java (2.1.4-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-9
+11

debian/control

@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- debhelper (>= 9),
+ debhelper (>= 11),
  default-jdk,
  junit,
  libgeronimo-jms-1.1-spec-java,
@@ -16,10 +16,10 @@ Build-Depends:
  libmockito-java,
  libslf4j-java,
  maven-repo-helper
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/libbtm-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libbtm-java
 Homepage: https://github.com/bitronix/btm
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libbtm-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libbtm-java.git
 
 Package: libbtm-java
 Architecture: all

debian/patches/java11-compatibility.patch

+Description: Fixes the build failure with Java 11
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -41,7 +41,7 @@
+             }
+         </echo>
+ 
+-        <javac srcdir="${dir.src}" destdir="${dir.classes}" source="1.5" target="1.5" fork="true" debug="true"
++        <javac srcdir="${dir.src}" destdir="${dir.classes}" release="7" fork="true" debug="true"
+                classpathref="javac.classpath"/>
+ 
+         <delete file="${jar.file}" failonerror="true"/>

debian/patches/series

@@ -2,3 +2,4 @@ add-pom-file.patch
 transition-to-openjdk7.patch
 fix-jms-proper-usage-mock-test.patch
 disable-tests.patch
+java11-compatibility.patch

debian/rules

@@ -27,6 +27,3 @@ override_dh_clean:
 	rm -rf target/*
 	rm -f TESTS-TestSuites.xml
 	rm -f src/bitronix/tm/Version.java
-
-get-orig-source:
-	uscan --debug --force-download --download-version $(VERSION) --rename