[med-svn] [Git][med-team/htsjdk][master] 2 commits: adapt for openjdk 11, use jaxb-api, closes #913566

[Olivier Sallou]

Olivier Sallou pushed to branch master at Debian Med / htsjdk


Commits:
2b92e8a8 by Olivier Sallou at 2018-11-12T15:44:40Z
adapt for openjdk 11, use jaxb-api, closes #913566

- - - - -
7b990088 by Olivier Sallou at 2018-11-12T15:55:20Z
add jaxb impl

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libhtsjdk-java.classpath
- + debian/patches/100-fix-java11
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+htsjdk (2.16.1+dfsg-2) unstable; urgency=medium
+
+  * Fix FTBS with OpenJDK 11 (Closes: #913566) 
+
+ -- Olivier Sallou <osallou at debian.org>  Mon, 12 Nov 2018 15:38:32 +0000
+
 htsjdk (2.16.1+dfsg-1) unstable; urgency=medium
 
   [ Andreas Tille ]


=====================================
debian/control
=====================================
@@ -13,6 +13,8 @@ Build-Depends: default-jdk (>= 2:1.9),
                debhelper (>= 11~),
                libcommons-jexl2-java,
                libcommons-logging-java,
+               libjaxb-api-java,
+               libjaxb-java,
                libsnappy-java,
                libcommons-compress-java,
                libxz-java (>= 1.5),


=====================================
debian/libhtsjdk-java.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/htsjdk.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-logging.jar /usr/share/java/snappy-java.jar /usr/share/java/commons-compress.jar /usr/share/java/xz.jar /usr/share/java/ngs-java.jar
+usr/share/java/htsjdk.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-logging.jar /usr/share/java/snappy-java.jar /usr/share/java/commons-compress.jar /usr/share/java/xz.jar /usr/share/java/ngs-java.jar /usr/share/java/libjaxb-api.jar /usr/share/java/jaxb-impl.jar


=====================================
debian/patches/100-fix-java11
=====================================
@@ -0,0 +1,39 @@
+Subject: add jaxb-api jar for openjdk 11
+Description: xml.bind has been removed from openjdk 11,
+ add jaxb-api jar file to compilation and classpath
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2018-11-12
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -22,12 +22,14 @@
+     compile "org.apache.commons:commons-compress:1.4.1"
+     compile "org.tukaani:xz:1.5"
+     compile "gov.nih.nlm.ncbi:ngs-java:2.9.0"
++    compile "javax.xml.bind:jaxb-api:debian"
+ 
+     testCompile "org.scala-lang:scala-library:2.11.x"
+     //testCompile "org.scalatest:scalatest_2.12:3.0.5"
+     //testRuntime 'org.pegdown:pegdown:1.6.0' // Necessary for generating HTML reports with ScalaTest
+     testCompile "org.testng:testng:debian"
+     testCompile "com.google.jimfs:jimfs:debian"
++    testCompile "com.sun.xml.bind:jaxb-impl:debian"
+  }
+ 
+ sourceCompatibility = 1.8
+@@ -93,7 +95,6 @@
+     if (System.env.CI == "true") {
+         jvmArgs += '-Dsamjdk.sra_libraries_download=true'
+     }
+-    jvmArgs += ["--add-modules", "java.xml.bind"]
+ 
+     exclude 'htsjdk/samtools/sra/**'
+     exclude 'htsjdk/samtools/BAMFileIndexTest.java'
+@@ -120,7 +121,6 @@
+ if (JavaVersion.current().isJava8Compatible()) {
+     tasks.withType(Javadoc) {
+         options.addStringOption('Xdoclint:none', '-quiet')
+-        options.addStringOption('-add-modules', 'java.xml.bind')
+     }
+ }
+ 


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@
 80-2to3.patch
 90-disable-testftp.patch
 92-disable-testhttp.patch
+100-fix-java11



View it on GitLab: https://salsa.debian.org/med-team/htsjdk/compare/e6e4faf23f72599afa4e4351af324504a0a73934...7b99008826b9ed1a6b80cc8bae6fcbfe45cf307c

-- 
View it on GitLab: https://salsa.debian.org/med-team/htsjdk/compare/e6e4faf23f72599afa4e4351af324504a0a73934...7b99008826b9ed1a6b80cc8bae6fcbfe45cf307c
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/debian-med-commit/attachments/20181112/c7eb4790/attachment-0001.html>