debian/ant.properties

-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

+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.

debian/compat

-10
+11

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/

debian/patches/getContentDocument.patch

+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;
++    }
+     
+     
+     /**

debian/patches/java10.patch

+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>
+ 

debian/patches/series

@@ -2,3 +2,5 @@
 02_build_dont_unzip.patch
 03_bootclasspath.patch
 04_manifest_classpath.patch
+java10.patch
+getContentDocument.patch