[jaxb] 09/24: Build libtxw2-java and relocate the com.sun.xml.txw2 artifacts to org.glassfish.jaxb

[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 55463e79726f778dffd9ab72afb5603e1e2b9b48
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 13:17:32 2017 +0200

    Build libtxw2-java and relocate the com.sun.xml.txw2 artifacts to org.glassfish.jaxb
---
 debian/changelog                             |  2 ++
 debian/control                               | 10 ++++++++--
 debian/libjaxb-java.classpath                |  1 -
 debian/libjaxb-java.poms                     |  7 ++++---
 debian/libtxw2-java.classpath                |  1 +
 debian/patches/02-args4j-compatibility.patch | 10 ++++++++++
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50b3780..92ebc3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ jaxb (2.2.10-1) UNRELEASED; urgency=medium
       and xml-commons-resolver1.1
     - Build librngom-java and relocate the org.kohsuke.rngom artifact
       to com.sun.xml.bind.external
+    - Build libtxw2-java and relocate the com.sun.xml.txw2 artifacts
+      to org.glassfish.jaxb
   * Track and download the new releases from GitHub
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 16a19cc..aa06b9f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
  libmaven-dependency-plugin-java,
  libmaven-javadoc-plugin-java,
  libmsv-java,
- libtxw2-java (>= 0.1+20110809),
  librelaxng-datatype-java,
  maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.0
@@ -27,7 +26,7 @@ Homepage: https://jaxb.java.net
 
 Package: libjaxb-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, librngom-java (>= ${source:Version})
+Depends: ${misc:Depends}, ${maven:Depends}, librngom-java (>= ${source:Version}), libtxw2-java (>= ${source:Version})
 Suggests: ${maven:OptionalDepends}
 Description: JAXB Reference Implementation
  GlassFish Java Architecture for XML Binding (JAXB) Reference
@@ -77,3 +76,10 @@ Description: Java library for parsing RELAX NG grammars
     or another data structure that preserves more of the parsed information
   * parse foreign elements/attributes in a schema
   * parse comments in a schema
+
+Package: libtxw2-java
+Architecture: all
+Depends: ${misc:Depends}, libargs4j-java, libcodemodel-java, librngom-java (>= ${source:Version}), libxsom-java
+Description: Typed XML Writer for Java
+ A Java library that allows client applications to write arbitrary
+ well-formed typed XML documents.
diff --git a/debian/libjaxb-java.classpath b/debian/libjaxb-java.classpath
index fd84f01..50377d7 100644
--- a/debian/libjaxb-java.classpath
+++ b/debian/libjaxb-java.classpath
@@ -4,4 +4,3 @@ usr/share/java/jaxb-jxc.jar                      jaxb-xjc.jar jaxb-runtime.jar
 usr/share/java/jaxb-runtime.jar                  jaxb-core.jar stax-ex.jar stax-api.jar FastInfoset.jar
 usr/share/java/jaxb-xjc.jar                      jaxb-core.jar xsom.jar codemodel.jar rngom.jar dtd-parser.jar istack-commons-tools.jar
 usr/share/java/jaxb1-impl.jar                    jaxb-runtime.jar msv-core.jar
-usr/share/java/txwc2.jar                         rngom.jar txw2.jar codemodel.jar args4j.jar xsom.jar
diff --git a/debian/libjaxb-java.poms b/debian/libjaxb-java.poms
index ec2ec13..dc4ab33 100644
--- a/debian/libjaxb-java.poms
+++ b/debian/libjaxb-java.poms
@@ -11,11 +11,12 @@ jaxb-ri/jxc/pom.xml
 jaxb-ri/runtime/pom.xml
 jaxb-ri/runtime/impl/pom.xml
 jaxb-ri/runtime/jaxb1/pom.xml
-jaxb-ri/txw/pom.xml
-jaxb-ri/txw/compiler/pom.xml
-jaxb-ri/txw/runtime/pom.xml
 jaxb-ri/xjc/pom.xml
 
+jaxb-ri/txw/pom.xml --no-parent --package=libtxw2-java
+jaxb-ri/txw/compiler/pom.xml    --package=libtxw2-java --relocate=com.sun.xml.txw2:txwc2
+jaxb-ri/txw/runtime/pom.xml     --package=libtxw2-java --relocate=com.sun.xml.txw2:txw2
+
 jaxb-ri/bundles/pom.xml --ignore
 jaxb-ri/docs/pom.xml --ignore
 jaxb-ri/samples/pom.xml --ignore
diff --git a/debian/libtxw2-java.classpath b/debian/libtxw2-java.classpath
new file mode 100644
index 0000000..0241734
--- /dev/null
+++ b/debian/libtxw2-java.classpath
@@ -0,0 +1 @@
+usr/share/java/txwc2.jar                         rngom.jar txw2.jar codemodel.jar args4j.jar xsom.jar
diff --git a/debian/patches/02-args4j-compatibility.patch b/debian/patches/02-args4j-compatibility.patch
index 2beced6..4c41c6c 100644
--- a/debian/patches/02-args4j-compatibility.patch
+++ b/debian/patches/02-args4j-compatibility.patch
@@ -129,3 +129,13 @@ Forwarded: no
              return new SAXParseable(in,eh);
  
          // otherwise sniff from the file extension
+--- a/jaxb-ri/txw/compiler/pom.xml
++++ b/jaxb-ri/txw/compiler/pom.xml
+@@ -87,6 +87,7 @@
+         <dependency>
+             <groupId>args4j</groupId>
+             <artifactId>args4j</artifactId>
++            <version>debian</version>
+         </dependency>
+         <dependency>
+             <groupId>com.sun.xsom</groupId>

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