[Git][java-team/libxerces2-java][master] 10 commits: Switch to compat level 11.

Markus Koschany gitlab at salsa.debian.org
Sat May 12 21:30:35 BST 2018


Markus Koschany pushed to branch master at Debian Java Maintainers / libxerces2-java


Commits:
47c7e8d9 by Markus Koschany at 2018-05-12T21:47:01+02:00
Switch to compat level 11.

- - - - -
98d090f6 by Markus Koschany at 2018-05-12T21:47:15+02:00
Declare compliance with Debian Policy 4.1.4.

- - - - -
c13a6b7f by Markus Koschany at 2018-05-12T21:47:50+02:00
Remove Damien Raude-Morvan Marcus Better from Uploaders.

- - - - -
371b2c42 by Markus Koschany at 2018-05-12T21:50:22+02:00
Remove trailing whitespace

- - - - -
a3f320ad by Markus Koschany at 2018-05-12T21:55:12+02:00
Add java10.patch and fix FTBFS with Java 9 and Java 10.

Closes: #893346

- - - - -
f4abe1fd by Markus Koschany at 2018-05-12T21:56:43+02:00
Update changelog

- - - - -
a330cb80 by Markus Koschany at 2018-05-12T21:57:13+02:00
Fix series file.

- - - - -
e2f403ba by Markus Koschany at 2018-05-12T21:59:23+02:00
Use source/target 1.7.

- - - - -
0f580525 by Markus Koschany at 2018-05-12T22:17:45+02:00
Add getContentDocument.patch and fix another FTBFS with Java 10.

- - - - -
d180f13e by Markus Koschany at 2018-05-12T22:21:27+02:00
Update changelog

- - - - -


8 changed files:

- debian/ant.properties
- debian/changelog
- debian/compat
- debian/control
- debian/maven.rules
- + debian/patches/getContentDocument.patch
- + debian/patches/java10.patch
- debian/patches/series


Changes:

=====================================
debian/ant.properties
=====================================
--- 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


=====================================
debian/changelog
=====================================
--- 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 at 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 at 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 at 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 at 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 at 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 at debian.org>  Thu,  7 Feb 2002 16:37:15 +0100


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,19 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
- Marcus Better <marcus at better.se>,
  Matthias Klose <doko at ubuntu.com>,
- Damien Raude-Morvan <drazzib at debian.org>,
  Jakub Adam <jakub.adam at ktknet.cz>,
  Emmanuel Bourg <ebourg at 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/


=====================================
debian/maven.rules
=====================================
--- 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/ * *


=====================================
debian/patches/getContentDocument.patch
=====================================
--- /dev/null
+++ b/debian/patches/getContentDocument.patch
@@ -0,0 +1,84 @@
+From: Markus Koschany <apo at 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;
++    }
+     
+     
+     /**


=====================================
debian/patches/java10.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10.patch
@@ -0,0 +1,181 @@
+From: Markus Koschany <apo at 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>
+ 


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/java-team/libxerces2-java/compare/659aa2066c00fb91abc6fc9243b6a10cff64089e...d180f13ed59142c02881fe0f6ceac08408ade028

---
View it on GitLab: https://salsa.debian.org/java-team/libxerces2-java/compare/659aa2066c00fb91abc6fc9243b6a10cff64089e...d180f13ed59142c02881fe0f6ceac08408ade028
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/20180512/c93fbe54/attachment.html>


More information about the pkg-java-commits mailing list