[libjaxen-java] 04/05: Fixed the build failure with Java 9 (Closes: #893262)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjaxen-java.

commit 13805a1f76a9ff4939553364975d5ee7fdb1b0ee
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 17 23:31:58 2018 +0100

    Fixed the build failure with Java 9 (Closes: #893262)
---
 debian/changelog                            |  1 +
 debian/patches/01-java9-compatibility.patch | 40 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fdb0ea7..d73ccb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libjaxen-java (1.1.6-3) UNRELEASED; urgency=medium
 
+  * Fixed the build failure with Java 9 (Closes: #893262)
   * Removed Damien Raude-Morvan from the uploaders (Closes: #889408)
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/patches/01-java9-compatibility.patch b/debian/patches/01-java9-compatibility.patch
new file mode 100644
index 0000000..cd03f07
--- /dev/null
+++ b/debian/patches/01-java9-compatibility.patch
@@ -0,0 +1,40 @@
+Description: Removes the UserDataHandler interface (already provided by the JDK) to avoid a build failure with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/java/main/org/w3c/dom/UserDataHandler.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/** This is a W3C interface we include here so that NamespaceNode can compile in both
+- *  Java 1.4 and 1.5. It's owned by the W3C, and available under their usual 
+- *  extremely liberal license so this shouldn't bother anyone. (XPath itself
+- *  is under the same license after all.)
+- */
+-
+-package org.w3c.dom;
+-
+-public interface UserDataHandler {
+-    // OperationType
+-    public static final short NODE_CLONED               = 1;
+-    public static final short NODE_IMPORTED             = 2;
+-    public static final short NODE_DELETED              = 3;
+-    public static final short NODE_RENAMED              = 4;
+-    public static final short NODE_ADOPTED              = 5;
+-
+-    public void handle(short operation, 
+-                       String key, 
+-                       Object data, 
+-                       Node src, 
+-                       Node dst);
+-
+-}
+\ No newline at end of file
+--- a/pom.xml
++++ b/pom.xml
+@@ -243,7 +243,6 @@
+             <Bundle-Version>${project.version}</Bundle-Version>
+             <Export-Package>org.jaxen.*;version=${project.version}</Export-Package>
+             <Include-Resource>
+-              org/w3c/dom/UserDataHandler.class=target/classes/org/w3c/dom/UserDataHandler.class,
+               META-INF/LICENSE.txt=LICENSE.txt
+             </Include-Resource>
+             <Import-Package>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..12bc5e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java9-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxen-java.git