[Git][java-team/jabref][master] 6 commits: Include openjdk-8-jdk as a build-dependency for the xjc binary.

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / jabref


Commits:
a99a4354 by tony mancill at 2018-10-31T13:44:57Z
Include openjdk-8-jdk as a build-dependency for the xjc binary.

Note that this package still uses default-jdk for the compilation
itself.  It cannot depend solely on openjdk-8-jdk, as Debian's
gradle fails to run on that JDK.

- - - - -
adb25838 by tony mancill at 2018-10-31T13:46:16Z
Patch build.gradle to include jaxb-api

- - - - -
d32afd12 by tony mancill at 2018-10-31T13:48:20Z
Bump Standards-Version to 4.2.1

- - - - -
8fd4b65d by tony mancill at 2018-11-01T00:30:49Z
prepare changelog for upload to unstable

- - - - -
3a09cf04 by tony mancill at 2018-11-01T00:58:01Z
Merge branch 'master' of salsa.debian.org:java-team/jabref

- - - - -
854939ef by tony mancill at 2018-11-01T00:59:19Z
restore LP bug number to changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/080_jdk11_jaxb.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,15 @@
-jabref (3.8.2+ds-8) UNRELEASED; urgency=medium
+jabref (3.8.2+ds-8) unstable; urgency=medium
 
   * Add runtime dep on jaxb and update wrapper script for openjdk 11
     (Closes: #912221, LP: #1799106)
-
- -- tony mancill <tmancill at debian.org>  Tue, 30 Oct 2018 20:54:56 -0700
+  * Include openjdk-8-jdk as a build-dep for the xjc binary (removed
+    in openjdk-11) and patch build.gradle to compile using jaxb-api.
+    Note that this package still uses default-jdk for the compilation
+    itself. It cannot depend solely on openjdk-8-jdk, as Debian's
+    gradle fails to run on that JDK. (Addresses FTBFS)
+  * Bump Standards-Version to 4.2.1.
+
+ -- tony mancill <tmancill at debian.org>  Wed, 31 Oct 2018 17:30:24 -0700
 
 jabref (3.8.2+ds-7) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -30,16 +30,17 @@ Build-Depends-Indep: ant,
                      liblog4j2-java (>= 2.10.0-2) | liblog4j2-java (<< 2.10),
                      libmicroba-java,
                      libmysql-java,
-                     libpdfbox-java (<< 1:2),
+                     libpdfbox-java,
                      libpostgresql-jdbc-java (>= 9.4.1212),
                      libreoffice-java-common,
                      libscram-java,
                      libspin-java,
-                     libswingx-java (<< 1:1.6.4),
+                     libswingx-java,
                      libunirest-java-java,
                      default-jdk,
+                     openjdk-8-jdk,
                      ure (>= 5.0~)
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/java-team/jabref
 Vcs-Git: https://salsa.debian.org/java-team/jabref.git
 Homepage: https://www.jabref.org/


=====================================
debian/patches/080_jdk11_jaxb.patch
=====================================
@@ -0,0 +1,10 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -129,6 +129,7 @@
+     compile 'org.apache.logging.log4j:log4j-core:2.7'
+     //compile 'org.xmlunit:xmlunit-core:2.3.0'
+     //compile 'org.xmlunit:xmlunit-matchers:2.3.0'
++    compile 'javax.xml.bind:jaxb-api:2.3.0'
+ 
+     testCompile 'junit:junit:4.12'
+     testCompile 'org.mockito:mockito-core:2.6.2'


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
 050_unirest_json.patch
 060_0664_perms.patch
 070_jdk9_swing.patch
+080_jdk11_jaxb.patch



View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/dd473843bcde079c8c1ba7ac04a89a35c0977cbf...854939ef52bc49a5133817ebfe178c8ac1120e0f

-- 
View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/dd473843bcde079c8c1ba7ac04a89a35c0977cbf...854939ef52bc49a5133817ebfe178c8ac1120e0f
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/pkg-java-commits/attachments/20181101/233a0d75/attachment.html>