diff options
| author | Markus Koschany <apo@debian.org> | 2018-05-12 21:55:41 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2018-05-13 04:35:16 +0000 |
| commit | 2506a4c1a4df3aa4a34506e96813e420cec1a822 (patch) | |
| tree | 9294ad2a06edf1d7980704aa3fec781f10179f85 | |
| parent | 17ac33a2112f4c068827b722cf69cb2941ca837a (diff) | |
2.11.0-9 (patches unapplied)import/2.11.0-9ubuntu/cosmic-proposedubuntu/cosmic-develubuntu/cosmic
Imported using git-ubuntu import.
Notes
Notes:
* Team upload.
* Switch to compat level 11.
* Declare compliance with Debian Policy 4.1.4.
* Remove Damien Raude-Morvan Marcus Better from Uploaders. (Closes: #889443)
* Add java10.patch and fix FTBFS with Java 9 and Java 10. (Closes: #893346)
* Add getContentDocument.patch and fix another FTBFS with Java 10.
* Use source/target 1.7.
| -rw-r--r-- | debian/ant.properties | 8 | ||||
| -rw-r--r-- | debian/changelog | 26 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/maven.rules | 2 | ||||
| -rw-r--r-- | debian/patches/getContentDocument.patch | 84 | ||||
| -rw-r--r-- | debian/patches/java10.patch | 181 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
8 files changed, 294 insertions, 17 deletions
diff --git a/debian/ant.properties b/debian/ant.properties index 9771673..5f2642e 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,4 +1,4 @@ -ant.build.javac.source=1.4 -ant.build.javac.target=1.4 -javac.source=1.4 -javac.target=1.4 +ant.build.javac.source=1.7 +ant.build.javac.target=1.7 +javac.source=1.7 +javac.target=1.7 diff --git a/debian/changelog b/debian/changelog index 5f6c96b..b6c45db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libxerces2-java (2.11.0-9) unstable; urgency=medium + + * Team upload. + * Switch to compat level 11. + * Declare compliance with Debian Policy 4.1.4. + * Remove Damien Raude-Morvan Marcus Better from Uploaders. (Closes: #889443) + * Add java10.patch and fix FTBFS with Java 9 and Java 10. (Closes: #893346) + * Add getContentDocument.patch and fix another FTBFS with Java 10. + * Use source/target 1.7. + + -- Markus Koschany <apo@debian.org> Sat, 12 May 2018 21:55:41 +0200 + libxerces2-java (2.11.0-8) unstable; urgency=medium * Team upload. @@ -34,7 +46,7 @@ libxerces2-java (2.11.0-6) unstable; urgency=low * Update links for libxml-commons-external-java 1.4 (Closes: #663913) * Bump Standards Version to 3.9.3 (no changes). * Build class files with source/target = 1.4 to ensure backwards - compatibility. Thanks to James Page. (Closes: #673177) + compatibility. Thanks to James Page. (Closes: #673177) -- tony mancill <tmancill@debian.org> Thu, 17 May 2012 21:38:27 -0700 @@ -72,7 +84,7 @@ libxerces2-java (2.11.0-2) unstable; urgency=low * Add myself as Uploaders. * Add Depends on libxml-commons-external-java for jaxp-1.4.jar (Closes: #639333). - * Drop Depends on libjaxp-1.3.jar. + * Drop Depends on libjaxp-1.3.jar. -- Damien Raude-Morvan <drazzib@debian.org> Sat, 27 Aug 2011 00:05:03 +0200 @@ -189,7 +201,7 @@ libxerces2-java (2.8.0-0) experimental; urgency=low libxerces2-java (2.6.2-4) unstable; urgency=low - * gnujaxp transition + * gnujaxp transition -- Wolfgang Baer <WBaer@gmx.de> Tue, 17 Jan 2006 21:50:14 +0100 @@ -205,18 +217,18 @@ libxerces2-java (2.6.2-3) unstable; urgency=low libxerces2-java (2.6.2-2) unstable; urgency=medium - * Included DOM Level 2 sources from the libjaxp1.2-java + * Included DOM Level 2 sources from the libjaxp1.2-java source package to built against them (closes: #304524) Note: This is a temporary solution - after sarge we will update ant which includes bootclasspath support for jikes need to build without included sources. * Included README.dom2-sources explaining where the DOM Level 2 sources come from, why they are needed ... - * Included build.xml patch to copy the DOM Level 2 sources from the + * Included build.xml patch to copy the DOM Level 2 sources from the debian directory - before the build - to the build directory. * Changed Build-Depends to Build-Depends-Indep to fix lintian warning. * (avdyk) Added Wolfgang to the uploaders. - + -- Wolfgang Baer <WBaer@gmx.de> Tue, 19 Apr 2005 20:28:25 +0200 libxerces2-java (2.6.2-1) unstable; urgency=low @@ -338,7 +350,7 @@ xerces2-j (2.0.1-1) unstable; urgency=low xerces2-j (2.0.0-1) unstable; urgency=low * Initial release - * Placed in contrib because it requires Ant and a Java2 environment + * Placed in contrib because it requires Ant and a Java2 environment to build -- Stefan Gybas <sgybas@debian.org> Thu, 7 Feb 2002 16:37:15 +0100 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 7ad46e9..8b7c1f8 100644 --- a/debian/control +++ b/debian/control @@ -3,21 +3,19 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: - Marcus Better <marcus@better.se>, Matthias Klose <doko@ubuntu.com>, - Damien Raude-Morvan <drazzib@debian.org>, Jakub Adam <jakub.adam@ktknet.cz>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: ant, - debhelper (>= 10), + debhelper (>= 11), default-jdk, javahelper, libstylebook-java, libxml-commons-external-java (>= 1.4.01-2), libxml-commons-resolver1.1-java, maven-repo-helper -Standards-Version: 3.9.8 +Standards-Version: 4.1.4 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxerces2-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxerces2-java.git Homepage: http://xerces.apache.org/xerces2-j/ diff --git a/debian/maven.rules b/debian/maven.rules index 7a551fb..a500e6a 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1 @@ -xml-apis s/xml-apis/xml-apis-1.4/ * s/.*/debian/ * * +xml-apis s/xml-apis/xml-apis-1.4/ * s/.*/debian/ * * diff --git a/debian/patches/getContentDocument.patch b/debian/patches/getContentDocument.patch new file mode 100644 index 0000000..06f443c --- /dev/null +++ b/debian/patches/getContentDocument.patch @@ -0,0 +1,84 @@ +From: Markus Koschany <apo@debian.org> +Date: Sat, 12 May 2018 22:12:44 +0200 +Subject: getContentDocument + +Fix FTBFS with Java10 due to missing method getContentDocument. + +Forwarded: no +--- + src/org/apache/html/dom/HTMLFrameElementImpl.java | 7 +++++++ + src/org/apache/html/dom/HTMLIFrameElementImpl.java | 5 +++++ + src/org/apache/html/dom/HTMLObjectElementImpl.java | 5 +++++ + 3 files changed, 17 insertions(+) + +diff --git a/src/org/apache/html/dom/HTMLFrameElementImpl.java b/src/org/apache/html/dom/HTMLFrameElementImpl.java +index 18ab953..e90a592 100644 +--- a/src/org/apache/html/dom/HTMLFrameElementImpl.java ++++ b/src/org/apache/html/dom/HTMLFrameElementImpl.java +@@ -17,6 +17,8 @@ + package org.apache.html.dom;
+
+ import org.w3c.dom.html.HTMLFrameElement;
++import org.w3c.dom.Document;
++
+
+ /**
+ * @xerces.internal
+@@ -127,6 +129,11 @@ public class HTMLFrameElementImpl + setAttribute( "src", src );
+ }
+
++ public Document getContentDocument()
++ {
++ return null;
++ }
++
+
+ /**
+ * Constructor requires owner document.
+diff --git a/src/org/apache/html/dom/HTMLIFrameElementImpl.java b/src/org/apache/html/dom/HTMLIFrameElementImpl.java +index c326557..287ba9e 100644 +--- a/src/org/apache/html/dom/HTMLIFrameElementImpl.java ++++ b/src/org/apache/html/dom/HTMLIFrameElementImpl.java +@@ -17,6 +17,7 @@ + package org.apache.html.dom;
+
+ import org.w3c.dom.html.HTMLIFrameElement;
++import org.w3c.dom.Document;
+
+ /**
+ * @xerces.internal
+@@ -150,6 +151,10 @@ public class HTMLIFrameElementImpl + setAttribute( "width", width );
+ }
+
++ public Document getContentDocument()
++ {
++ return null;
++ }
+
+ /**
+ * Constructor requires owner document.
+diff --git a/src/org/apache/html/dom/HTMLObjectElementImpl.java b/src/org/apache/html/dom/HTMLObjectElementImpl.java +index b065e69..cd27fc8 100644 +--- a/src/org/apache/html/dom/HTMLObjectElementImpl.java ++++ b/src/org/apache/html/dom/HTMLObjectElementImpl.java +@@ -17,6 +17,7 @@ + package org.apache.html.dom;
+
+ import org.w3c.dom.html.HTMLObjectElement;
++import org.w3c.dom.Document;
+
+ /**
+ * @xerces.internal
+@@ -239,6 +240,10 @@ public class HTMLObjectElementImpl + setAttribute( "width", width );
+ }
+
++ public Document getContentDocument()
++ {
++ return null;
++ }
+
+
+ /**
diff --git a/debian/patches/java10.patch b/debian/patches/java10.patch new file mode 100644 index 0000000..c141991 --- /dev/null +++ b/debian/patches/java10.patch @@ -0,0 +1,181 @@ +From: Markus Koschany <apo@debian.org> +Date: Sat, 12 May 2018 21:52:36 +0200 +Subject: java10 + +Fix FTBFS with Java 9 and Java 10 because the bootclasspath option was removed +upstream and -Xbootclasspath/a is the only valid option at the moment. + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893346 +Forwarded: no +--- + build.xml | 41 ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/build.xml b/build.xml +index 8901b4b..7971953 100644 +--- a/build.xml ++++ b/build.xml +@@ -298,7 +298,6 @@ Authors: + optimize="${optimize}"
+ includeAntRuntime="false"
+ includeJavaRuntime="true"
+- bootclasspath="/usr/share/java/jaxp-1.4.jar:/usr/share/java/xml-apis-ext.jar:/usr/share/java/xml-resolver.jar"
+ excludes="org/xml/sax/**
+ javax/xml/**
+ org/w3c/dom/*
+@@ -753,35 +752,35 @@ Authors: + <java fork="yes"
+ classname="sax.Counter"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="${data.dir}/personal.xml"/>
+ </java>
+ <echo message="Running sax.Writer ..." />
+ <java fork="yes"
+ classname="sax.Writer"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="${data.dir}/personal.xml"/>
+ </java>
+ <echo message="Running dom.Counter ..." />
+ <java fork="yes"
+ classname="dom.Counter"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="${data.dir}/personal.xml"/>
+ </java>
+ <echo message="Running dom.Writer ..." />
+ <java fork="yes"
+ classname="dom.Writer"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="${data.dir}/personal.xml"/>
+ </java>
+ <echo message="Running thread.Test dom" />
+ <java fork="yes"
+ classname="thread.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="-dom"/>
+ <arg value="-threads"/>
+ <arg value="20"/>
+@@ -793,7 +792,7 @@ Authors: + <java fork="yes"
+ classname="thread.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="-threads"/>
+ <arg value="20"/>
+ <arg value="-time"/>
+@@ -834,19 +833,19 @@ Authors: + <java fork="yes"
+ classname="dom.DTest"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running dom.mem.Test ..." />
+ <java fork="yes"
+ classname="dom.mem.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running dom.range.Test ..." />
+ <java fork="yes"
+ classname="dom.range.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="all"/>
+ </java>
+
+@@ -854,13 +853,13 @@ Authors: + <java fork="yes"
+ classname="dom.ids.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running dom.serialization.Test ..." />
+ <java fork="yes"
+ classname="dom.serialization.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="${data.dir}/personal-schema.xml"/>
+ <arg value="out.xml"/>
+ </java>
+@@ -868,37 +867,37 @@ Authors: + <java fork="yes"
+ classname="dom.traversal.AllTests"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
+ </java>
+ <echo message="Running schema.Test ..." />
+ <java fork="yes"
+ classname="schema.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running schema.config.AllTests ..." />
+ <java fork="yes"
+ classname="schema.config.AllTests"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
+ </java>
+ <echo message="Running schema.annotations.AllTests ..." />
+ <java fork="yes"
+ classname="schema.annotations.AllTests"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
+ </java>
+ <echo message="Running jaxp.PropertyTest ..." />
+ <java fork="yes"
+ classname="jaxp.PropertyTest"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running jaxp.JAXPSpecTest ..." />
+ <java fork="yes"
+ classname="jaxp.JAXPSpecTest"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ <arg value="testSchemaLanguageSAX"/>
+ <arg value="testSchemaSourceSAX"/>
+ <arg value="testSchemaLanguageDOM"/>
+@@ -908,19 +907,19 @@ Authors: + <java fork="yes"
+ classname="xinclude.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running dom.registry.Test ..." />
+ <java fork="yes"
+ classname="dom.registry.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ <echo message="Running dom.dom3.Test ..." />
+ <java fork="yes"
+ classname="dom.dom3.Test"
+ failOnError="yes">
+- <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
++ <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
+ </java>
+ </target>
+
diff --git a/debian/patches/series b/debian/patches/series index 0e4eaf5..11a5293 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,5 @@ 02_build_dont_unzip.patch 03_bootclasspath.patch 04_manifest_classpath.patch +java10.patch +getContentDocument.patch |