[jaxb] 19/24: Replaced nb-javac-api with com.sun:tools

[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 fc8b596577cbb4805af72c0db6c9304d3aea9e93
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 17:14:51 2017 +0200

    Replaced nb-javac-api with com.sun:tools
---
 debian/changelog                             |  1 +
 debian/maven.rules                           |  1 +
 debian/patches/05-replace-nb-javac-api.patch | 22 ++++++++++++++++++++++
 debian/patches/series                        |  1 +
 4 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9358e28..90bfa2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ jaxb (2.3.0-1) UNRELEASED; urgency=medium
       to org.glassfish.jaxb
     - Refreshed debian/copyright
     - Build with xml-resolver instead of com.sun.org.apache.xml:resolver
+    - Replaced nb-javac-api with com.sun:tools
   * 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
index 97ee919..feb1e32 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,2 @@
 s/com.sun.org.apache.xml.internal/xml-resolver/ s/resolver/xml-resolver/ * s/.*/debian/ * *
+s/org.netbeans.external/com.sun/ s/nb-javac-api/tools/ * * * *
diff --git a/debian/patches/05-replace-nb-javac-api.patch b/debian/patches/05-replace-nb-javac-api.patch
new file mode 100644
index 0000000..828cadf
--- /dev/null
+++ b/debian/patches/05-replace-nb-javac-api.patch
@@ -0,0 +1,22 @@
+Description: Replaces nb-javac-api with a system dependency pointing to tools.jar from the JRE
+ (it won't work with Java 9 but this is the only alternative for now).
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jaxb-ri/pom.xml
++++ b/jaxb-ri/pom.xml
+@@ -208,10 +208,11 @@
+             <!-- JDK dependencies -->
+             <dependency>
+                 <!-- required by com.sun.tools.jxc.model.nav.ApNavigator (com.sun.source.*) -->
+-                <groupId>org.netbeans.external</groupId>
+-                <artifactId>nb-javac-api</artifactId>
+-                <version>RELEASE82</version>
+-                <scope>provided</scope>
++                <groupId>com.sun</groupId>
++                <artifactId>tools</artifactId>
++                <version>8</version>
++                <scope>system</scope>
++                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+             </dependency>
+             <dependency>
+                 <!-- required by com.sun.tools.xjc.Options on JDK < 9
diff --git a/debian/patches/series b/debian/patches/series
index 8cbadda..c297eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-args4j-compatibility.patch
 03-codemodel-dependencies-versions.patch
 04-xml-resolver-compatibility.patch
+05-replace-nb-javac-api.patch

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