debian/changelog

@@ -12,11 +12,10 @@ htsjdk (2.14.3+dfsg-1) UNRELEASED-targeting-experimental; urgency=medium
   * d/rules
     Disable unit testing due to gradle+testng errors in gradle 3.2
     gradle 3.4 will fix the problem
+  * Fix JDK9 with --add-modules java.xml.bind in javadoc generation
+  * Fix javadoc generation
     
   [TODO - O. Sallou in progress]
-  * Fix JDK9 with --add-modules java.xml.bind in javadoc generation and test, need a new patch
-  * Javadoc generation failure: certainly due to openjdk issues (exits with error
-    on warnings, would need to patch a lot of files to workaround the issue or disable javadoc package)
   * Reintroduce unit tests now that gradle 3.4 is available in sid
     - new patch is needed for latest upstream, referencing junit classes
     - add testng() call in build.gradle with a patch and set test call in d/rules back

debian/patches/40-fix-java9

+Subject: add support for java9
+Description: Java 9 uses modules, code makes use fo some modules,
+ need to add them
+Author: Olivier Sallou <osallou@debian.org>
+Last-Updated: 17-04-2018
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -115,6 +115,7 @@
+ if (JavaVersion.current().isJava8Compatible()) {
+     tasks.withType(Javadoc) {
+         options.addStringOption('Xdoclint:none', '-quiet')
++        options.addStringOption('-add-modules', 'java.xml.bind')
+     }
+ }
+ 

debian/patches/50-fix-javadoc

+Subject: javadoc exception
+Description: some exception is raised by javadoc
+ looks like an openjdk issue, this patch removes impacted
+ comments
+Author: Olivier Sallou <osallou@debian.org>
+Last-Updated: 2018-04-17
+Forwarded: no
+--- a/src/main/java/htsjdk/samtools/util/MergingIterator.java
++++ b/src/main/java/htsjdk/samtools/util/MergingIterator.java
+@@ -88,7 +88,6 @@
+ 	}
+ 
+ 	/**
+-	 * @see java.util.Iterator<T>.hasNext
+ 	 */
+ 	@Override
+ 	public boolean hasNext() {
+@@ -96,7 +95,6 @@
+ 	}
+ 
+ 	/**
+-	 * @see java.util.Iterator<T>.next
+ 	 */
+ 	@Override
+ 	public T next() {

debian/patches/series

@@ -2,3 +2,5 @@
 13-skip_network_tests
 20-fix-version.patch
 30-disable-scalatest.patch
+40-fix-java9
+50-fix-javadoc