[med-svn] [Git][med-team/picard-tools][master] Fixed the build failure with Java 11

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Med / picard-tools


Commits:
9359e09f by Emmanuel Bourg at 2018-11-30T12:29:23Z
Fixed the build failure with Java 11

- - - - -


2 changed files:

- debian/changelog
- debian/patches/10-build.xml.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+picard-tools (2.18.14+dfsg-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 11
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 30 Nov 2018 13:28:52 +0100
+
 picard-tools (2.18.14+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/10-build.xml.patch
=====================================
@@ -99,16 +99,15 @@ Last-Updated: 2016-07-07
  
  logger.info("build for version:" + version)
  group = 'com.github.broadinstitute'
-@@ -166,6 +171,8 @@
+@@ -166,6 +171,7 @@
  tasks.withType(Javadoc) {
      // do this for all javadoc tasks, including gatkDoc
      options.addStringOption('Xdoclint:none')
 +    options.addStringOption('XDignore.symbol.file')
-+    options.addStringOption('-add-modules', 'java.xml.bind')
  }
  
  javadoc {
-@@ -192,7 +199,8 @@
+@@ -192,7 +198,8 @@
  
      // The gatkDoc process instantiates any documented feature classes, so to run it we need the entire
      // runtime classpath, as well as jdk javadoc files such as tools.jar, where com.sun.javadoc lives.
@@ -118,7 +117,7 @@ Last-Updated: 2016-07-07
      options.docletpath = classpath.asType(List)
      options.doclet = "picard.util.help.PicardHelpDoclet"
  
-@@ -279,6 +287,8 @@
+@@ -279,6 +286,8 @@
          }
      }
  
@@ -127,7 +126,7 @@ Last-Updated: 2016-07-07
      // set heap size for the test JVM(s)
      minHeapSize = "1G"
      maxHeapSize = "2G"
-@@ -415,6 +425,7 @@
+@@ -415,6 +424,7 @@
      into "$htmlDir/picarddoc"
  }
  
@@ -135,7 +134,7 @@ Last-Updated: 2016-07-07
  task updateGhPages(dependsOn: ['copyJavadoc', 'copyPicardDoc']){
    outputs.dir htmlDir
  }
-@@ -430,3 +441,4 @@
+@@ -430,3 +440,4 @@
      into 'newdocs'
    }
  }



View it on GitLab: https://salsa.debian.org/med-team/picard-tools/commit/9359e09f6df2c08b2f2ec3269c9243b8ef06c449

-- 
View it on GitLab: https://salsa.debian.org/med-team/picard-tools/commit/9359e09f6df2c08b2f2ec3269c9243b8ef06c449
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/20181130/c7aecb8e/attachment-0001.html>