[jaxb] 17/24: Build with xml-resolver instead of com.sun.org.apache.xml:resolver

[Emmanuel Bourg]

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

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

commit 7f08feeca53a71cbe71b5b94ace9d608e679befd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 17:09:50 2017 +0200

    Build with xml-resolver instead of com.sun.org.apache.xml:resolver
---
 debian/changelog                                   |  1 +
 debian/maven.rules                                 |  1 +
 debian/patches/04-xml-resolver-compatibility.patch | 16 ++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 46b9d5c..9d9dcef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ jaxb (2.3.0-1) UNRELEASED; urgency=medium
     - Build libcodemodel-java and relocate the com.sun.codemodel artifacts
       to org.glassfish.jaxb
     - Refreshed debian/copyright
+    - Build with xml-resolver instead of com.sun.org.apache.xml:resolver
   * Track and download the new releases from GitHub
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..97ee919
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+s/com.sun.org.apache.xml.internal/xml-resolver/ s/resolver/xml-resolver/ * s/.*/debian/ * *
diff --git a/debian/patches/04-xml-resolver-compatibility.patch b/debian/patches/04-xml-resolver-compatibility.patch
new file mode 100644
index 0000000..c09b719
--- /dev/null
+++ b/debian/patches/04-xml-resolver-compatibility.patch
@@ -0,0 +1,16 @@
+Description: Build with xml-resolver instead of com.sun.org.apache.xml:resolver
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/CatalogUtil.java
++++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/CatalogUtil.java
+@@ -40,8 +40,8 @@
+ 
+ package com.sun.tools.xjc;
+ 
+-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
+-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
++import org.apache.xml.resolver.CatalogManager;
++import org.apache.xml.resolver.tools.CatalogResolver;
+ import java.io.File;
+ import java.io.IOException;
+ import java.net.URI;
diff --git a/debian/patches/series b/debian/patches/series
index 2a1acd8..8cbadda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-reactor-dependencies.patch
 02-args4j-compatibility.patch
 03-codemodel-dependencies-versions.patch
+04-xml-resolver-compatibility.patch

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