Commit db984822 authored by Andreas Tille's avatar Andreas Tille
Browse files

Use jaxb

parent 5f39af63

debian/control

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 11~), 
               libcommons-lang-java,

               libcommons-io-java,

               libecj-java,

               libjaxb-java,

               libsis-base-java (>= 18.08.0~),

               libhdf5-dev (>> 1.8.13),

               libargs4j-java,

debian/patches/series

+1 −0
Original line number Diff line number Diff line 
use_debian_packaged_libs.patch

use_jaxb.patch

debian/patches/use_debian_packaged_libs.patch

+2 −1
Original line number Diff line number Diff line 
--- a/.classpath

+++ b/.classpath

@@ -4,18 +4,17 @@

@@ -4,18 +4,18 @@

 	<classpathentry kind="src" path="sourceExamples/java"/>

 	<classpathentry kind="src" path="sourceTest/java"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
@@ -18,6 +18,7 @@ 
-	<classpathentry kind="lib" path="libs/prod/commons-io-2.6.jar" sourcepath="libs/prod/commons-io-2.6-sources.jar"/>

-	<classpathentry kind="lib" path="libs/prod/sis-base-18.08.0.jar" sourcepath="libs/prod/sis-base-18.08.0-sources.jar"/>

+	<classpathentry kind="lib" path="/usr/share/java/ecj.jar"/>

+	<classpathentry kind="lib" path="/usr/share/java/jaxb-core.jar"/>

+	<classpathentry kind="lib" path="/usr/share/java/hamcrest-core.jar"/>

+	<classpathentry kind="lib" path="/usr/share/java/hamcrest-integration.jar"/>

+	<classpathentry kind="lib" path="/usr/share/java/hamcrest-library.jar"/>

debian/patches/use_jaxb.patch

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Author: Emmanuel Bourg <ebourg@apache.org>

Date: Wed, 19 Sep 2018 23:29:20 +0200

Origin: https://lists.debian.org/debian-java/2018/09/msg00061.html

Description: It isn't missing, it's hidden by default to prepare its removal in the

 next Java release.

.

 > I guess this is what I need once Java 11 will be the default - but I

 > have no idea why the build stumbles upon this. :-(

 .

 Java 11 will soon be the default (maybe next week for the GA release?),

 so I recommend aiming for a long term solution.



--- a/source/java/ch/systemsx/cisd/hdf5/hdf5lib/HDFHelper.java

+++ b/source/java/ch/systemsx/cisd/hdf5/hdf5lib/HDFHelper.java

@@ -32,7 +32,7 @@ import static hdf.hdf5lib.HDF5Constants.

 import static hdf.hdf5lib.HDF5Constants.H5_INDEX_NAME;

 import static hdf.hdf5lib.HDF5Constants.H5_ITER_INC;

 

-import com.sun.xml.internal.bind.v2.runtime.Name;

+import com.sun.xml.bind.v2.runtime.Name;

 

 import hdf.hdf5lib.H5;

 import hdf.hdf5lib.HDF5Constants;