diff -Nru istack-commons-3.0.6/debian/changelog istack-commons-3.0.6/debian/changelog
--- istack-commons-3.0.6/debian/changelog	2019-07-10 03:27:16.000000000 +0000
+++ istack-commons-3.0.6/debian/changelog	2021-02-09 21:14:55.000000000 +0000
@@ -1,3 +1,13 @@
+istack-commons (3.0.6-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with OpenJDK 17 (Closes: #982403)
+  * Removed the unused dependency on sisu-inject-plexus
+  * Standards-Version updated to 4.5.1
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 09 Feb 2021 22:14:55 +0100
+
 istack-commons (3.0.6-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru istack-commons-3.0.6/debian/compat istack-commons-3.0.6/debian/compat
--- istack-commons-3.0.6/debian/compat	2019-07-10 03:27:16.000000000 +0000
+++ istack-commons-3.0.6/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru istack-commons-3.0.6/debian/control istack-commons-3.0.6/debian/control
--- istack-commons-3.0.6/debian/control	2019-07-10 03:27:16.000000000 +0000
+++ istack-commons-3.0.6/debian/control	2021-02-09 18:34:07.000000000 +0000
@@ -6,7 +6,7 @@
 Build-Depends:
  ant,
  ant-optional,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  junit (>= 3.8.2),
  junit4,
@@ -26,7 +26,7 @@
  libwagon-http-java,
  maven-debian-helper (>= 2.2),
  testng (>= 6)
-Standards-Version: 4.4.0
+Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/istack-commons.git
 Vcs-Browser: https://salsa.debian.org/java-team/istack-commons
 Homepage: https://javaee.github.io/jaxb-istack-commons/
diff -Nru istack-commons-3.0.6/debian/maven.ignoreRules istack-commons-3.0.6/debian/maven.ignoreRules
--- istack-commons-3.0.6/debian/maven.ignoreRules	2019-07-10 03:27:16.000000000 +0000
+++ istack-commons-3.0.6/debian/maven.ignoreRules	2021-02-09 18:39:23.000000000 +0000
@@ -4,4 +4,5 @@
 org.codehaus.mojo buildnumber-maven-plugin * * * *
 org.codehaus.mojo cobertura-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
+org.sonatype.sisu sisu-inject-plexus * * * *
 org.tmatesoft.svnkit svnkit * * * *
diff -Nru istack-commons-3.0.6/debian/patches/03-java-version-parsing.patch istack-commons-3.0.6/debian/patches/03-java-version-parsing.patch
--- istack-commons-3.0.6/debian/patches/03-java-version-parsing.patch	2019-07-10 03:27:16.000000000 +0000
+++ istack-commons-3.0.6/debian/patches/03-java-version-parsing.patch	2021-02-09 20:17:45.000000000 +0000
@@ -6,11 +6,13 @@
 
 --- a/istack-commons/tools/src/test/java/com/sun/istack/tools/ParallelWorldClassLoaderTest.java
 +++ b/istack-commons/tools/src/test/java/com/sun/istack/tools/ParallelWorldClassLoaderTest.java
-@@ -143,9 +143,9 @@
+@@ -142,10 +142,10 @@
+     }
  
      private static boolean isJDK9() {
-         String ver = System.getProperty("java.version");
+-        String ver = System.getProperty("java.version");
 -        int idx = ver.indexOf('-');
++        String ver = System.getProperty("java.specification.version");
 +        //int idx = ver.indexOf('-');
          int idx2 = ver.indexOf('.', 1);
 -        float v = Float.parseFloat(idx > 0 ? ver.substring(0, idx) : idx2 > 0 ? ver.substring(0, idx2) : ver);