[jaxb] 05/24: Build with Maven instead of Ant

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Sep 28 21:04:16 UTC 2017


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

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

commit b3ac390fd97c288d1d3b63617e48098ffe1a5aa2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 12:11:25 2017 +0200

    Build with Maven instead of Ant
---
 debian/changelog                                   |   4 +-
 debian/control                                     |  30 ++----
 debian/libjaxb-java-doc.install                    |   1 +
 debian/libjaxb-java-doc.javadoc                    |   1 -
 debian/libjaxb-java.classpath                      |  10 +-
 debian/libjaxb-java.jlibs                          |   4 -
 debian/libjaxb-java.poms                           |  23 +++-
 debian/maven.ignoreRules                           |  11 ++
 debian/maven.properties                            |   6 ++
 debian/patches/01-reactor-dependencies.patch       |  55 ++++++++++
 debian/patches/add-dependencies.patch              | 117 ---------------------
 debian/patches/dont-build-examples.patch           |  37 -------
 debian/patches/dont-bundle-other-jars.patch        |  44 --------
 debian/patches/dont-generate-1.0-runtime.patch     |  60 -----------
 debian/patches/dont-generate-jing-rnc-driver.patch |  31 ------
 debian/patches/dont-use-internal-resolver.patch    |  27 -----
 debian/patches/dont-use-prebuilt-javadocs.patch    |  26 -----
 debian/patches/fix-javadoc-build.diff              |  45 --------
 debian/patches/java8-compatibility.patch           |  23 ----
 .../patches/remove-classpath-from-manifests.patch  |  34 ------
 debian/patches/series                              |  11 +-
 debian/rules                                       |  63 ++---------
 22 files changed, 122 insertions(+), 541 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c513e9c..4b18360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jaxb (2.2.5-3) UNRELEASED; urgency=medium
+jaxb (2.2.10-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Build with Maven instead of Ant
   * 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 0fca669..17e2a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at debian.org>
 Build-Depends:
- ant,
  debhelper (>= 10),
  default-jdk,
  javahelper (>= 0.43),
  libargs4j-java,
  libcodemodel-java (>= 2.6),
+ libbuild-helper-maven-plugin-java,
  libdom4j-java,
  libdtd-parser-java,
  libfastinfoset-java,
@@ -17,12 +17,14 @@ Build-Depends:
  libistack-commons-java,
  libjaxb-api-java,
  libjing-java,
+ libmaven-dependency-plugin-java,
+ libmaven-javadoc-plugin-java,
  libmsv-java,
  librelaxngcc-java,
  librngom-java,
  libtxw2-java (>= 0.1+20110809),
  libxml-commons-resolver1.1-java,
- maven-repo-helper
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jaxb.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jaxb.git
@@ -30,24 +32,8 @@ Homepage: https://jaxb.java.net
 
 Package: libjaxb-java
 Architecture: all
-Depends:
- libargs4j-java,
- libcodemodel-java (>= 2.6),
- libdom4j-java,
- libdtd-parser-java,
- libfastinfoset-java,
- libisorelax-java,
- libistack-commons-java,
- libjaxb-api-java,
- libjing-java,
- libmsv-java,
- librelaxngcc-java,
- librngom-java,
- libtxw2-java (>= 0.1+20110809),
- libxml-commons-resolver1.1-java,
- ${java:Depends},
- ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: JAXB Reference Implementation
  GlassFish Java Architecture for XML Binding (JAXB) Reference
  Implementation.
@@ -64,8 +50,8 @@ Description: JAXB Reference Implementation
 Package: libjaxb-java-doc
 Architecture: all
 Section: doc
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
 Description: JAXB Reference Implementation -- documentation
  GlassFish Java Architecture for XML Binding (JAXB) Reference
  Implementation.
diff --git a/debian/libjaxb-java-doc.install b/debian/libjaxb-java-doc.install
new file mode 100644
index 0000000..15fbc89
--- /dev/null
+++ b/debian/libjaxb-java-doc.install
@@ -0,0 +1 @@
+jaxb-ri/target/site/apidocs/* /usr/share/doc/libjaxb-java/api/
diff --git a/debian/libjaxb-java-doc.javadoc b/debian/libjaxb-java-doc.javadoc
deleted file mode 100644
index c6556b5..0000000
--- a/debian/libjaxb-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-apidocs
diff --git a/debian/libjaxb-java.classpath b/debian/libjaxb-java.classpath
index 33bb65b..880d805 100644
--- a/debian/libjaxb-java.classpath
+++ b/debian/libjaxb-java.classpath
@@ -1,2 +1,8 @@
-usr/share/java/jaxb-impl.jar	/usr/share/java/dom4j.jar /usr/share/java/FastInfoset.jar /usr/share/java/isorelax.jar /usr/share/java/istack-commons-runtime.jar /usr/share/java/jaxb-api.jar /usr/share/java/jing.jar /usr/share/java/msv-core.jar /usr/share/java/relaxngDatatype.jar /usr/share/java/txw2.jar
-usr/share/java/jaxb-xjc.jar	/usr/share/java/args4j.jar /usr/share/java/codemodel.jar /usr/share/java/dtd-parser.jar /usr/share/java/istack-commons-tools.jar /usr/share/java/relaxngcc.jar /usr/share/java/relaxngDatatype.jar /usr/share/java/rngom.jar /usr/share/java/xml-resolver.jar /usr/share/java/xsom.jar
+usr/share/java/codemodel-annotation-compiler.jar codemodel.jar istack-commons-tools.jar
+usr/share/java/jaxb-core.jar                     jaxb-api.jar txw2.jar istack-commons-runtime.jar
+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/rngom.jar                         relaxngDatatype.jar
+usr/share/java/txwc2.jar                         rngom.jar txw2.jar codemodel.jar args4j.jar xsom.jar
diff --git a/debian/libjaxb-java.jlibs b/debian/libjaxb-java.jlibs
deleted file mode 100644
index 022e128..0000000
--- a/debian/libjaxb-java.jlibs
+++ /dev/null
@@ -1,4 +0,0 @@
-dist/lib/jaxb-impl.jar
-dist/lib/jaxb-xjc.jar
-tools/lib/util/pretty-printer.jar
-tools/xmllint/build/xmllint.jar
diff --git a/debian/libjaxb-java.poms b/debian/libjaxb-java.poms
index 70cf004..ed9ef4e 100644
--- a/debian/libjaxb-java.poms
+++ b/debian/libjaxb-java.poms
@@ -1,2 +1,21 @@
-jaxb-impl.pom
-jaxb-xjc.pom
+jaxb-ri/pom.xml
+jaxb-ri/boms/bom-ext/pom.xml
+jaxb-ri/boms/bom/pom.xml --no-parent
+jaxb-ri/codemodel/pom.xml
+jaxb-ri/codemodel/codemodel/pom.xml
+jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
+jaxb-ri/core/pom.xml
+jaxb-ri/external/pom.xml
+jaxb-ri/external/rngom/pom.xml
+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/bundles/pom.xml --ignore
+jaxb-ri/docs/pom.xml --ignore
+jaxb-ri/samples/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..91230b6
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,11 @@
+org.apache.maven.plugins maven-assembly-plugin
+org.apache.maven.plugins maven-enforcer-plugin
+org.apache.maven.plugins maven-release-plugin
+org.apache.maven.plugins maven-site-plugin
+org.apache.maven.plugins maven-source-plugin
+org.codehaus.mojo buildnumber-maven-plugin
+org.glassfish.build gfnexus-maven-plugin
+org.glassfish.hk2 osgiversion-maven-plugin
+
+* * * * * test
+* * * * sources *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..242da7e
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,6 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
+project.build.sourceEncoding=UTF-8
diff --git a/debian/patches/01-reactor-dependencies.patch b/debian/patches/01-reactor-dependencies.patch
new file mode 100644
index 0000000..479b83f
--- /dev/null
+++ b/debian/patches/01-reactor-dependencies.patch
@@ -0,0 +1,55 @@
+Description: Work around a maven-debian-helper bug where reactor dependencies
+ aren't properly recognized and switched to the 'debian' version, thus causing
+ a build failure.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jaxb-ri/runtime/impl/pom.xml
++++ b/jaxb-ri/runtime/impl/pom.xml
+@@ -65,6 +65,7 @@
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>jaxb-core</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.jvnet.staxex</groupId>
+--- a/jaxb-ri/runtime/jaxb1/pom.xml
++++ b/jaxb-ri/runtime/jaxb1/pom.xml
+@@ -61,6 +61,7 @@
+         <dependency>
+             <groupId>org.glassfish.jaxb</groupId>
+             <artifactId>jaxb-runtime</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>net.java.dev.msv</groupId>
+--- a/jaxb-ri/xjc/pom.xml
++++ b/jaxb-ri/xjc/pom.xml
+@@ -65,6 +65,7 @@
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>jaxb-core</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>junit</groupId>
+--- a/jaxb-ri/jxc/pom.xml
++++ b/jaxb-ri/jxc/pom.xml
+@@ -68,14 +68,17 @@
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>jaxb-xjc</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>jaxb-core</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>jaxb-runtime</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>com.sun</groupId>
diff --git a/debian/patches/add-dependencies.patch b/debian/patches/add-dependencies.patch
deleted file mode 100644
index 1c3c459..0000000
--- a/debian/patches/add-dependencies.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Description: Add missing dependencies and remove dependency on jvnet-parent
-
---- a/jaxb-impl.pom
-+++ b/jaxb-impl.pom
-@@ -43,12 +43,6 @@
- 
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- 
--    <parent>
--        <groupId>net.java</groupId>
--        <artifactId>jvnet-parent</artifactId>
--        <version>1</version>
--    </parent>
--    
-     <modelVersion>4.0.0</modelVersion>
-     <groupId>com.sun.xml.bind</groupId>
-     <artifactId>jaxb-impl</artifactId>
-@@ -91,6 +85,37 @@
-         <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
-     </scm>
- 
-+    <dependencies>
-+        <dependency>
-+            <groupId>isorelax</groupId>
-+            <artifactId>isorelax</artifactId>
-+            <scope>system</scope>
-+            <systemPath>/usr/share/java/isorelax.jar</systemPath>
-+        </dependency>
-+        <dependency>
-+            <groupId>net.java.dev.msv</groupId>
-+            <artifactId>msv</artifactId>
-+            <scope>system</scope>
-+            <systemPath>/usr/share/java/msv-core.jar</systemPath>
-+        </dependency>
-+        <dependency>
-+            <groupId>relaxngDatatype</groupId>
-+            <artifactId>relaxngDatatype</artifactId>
-+            <scope>system</scope>
-+            <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
-+        </dependency>
-+        <dependency>
-+            <groupId>com.sun.istack</groupId>
-+            <artifactId>istack-commons-runtime</artifactId>
-+            <version>2.6.1</version>
-+        </dependency>
-+        <dependency>
-+            <groupId>com.sun.xml.txw2</groupId>
-+            <artifactId>txw2</artifactId>
-+            <version>20110809</version>
-+        </dependency>
-+    </dependencies>
-+
-     <dependencyManagement>        
-         <dependencies>
-             <dependency>
---- a/jaxb-xjc.pom
-+++ b/jaxb-xjc.pom
-@@ -43,12 +43,6 @@
- 
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- 
--    <parent>
--        <groupId>net.java</groupId>
--        <artifactId>jvnet-parent</artifactId>
--        <version>1</version>
--    </parent>
--    
-     <modelVersion>4.0.0</modelVersion>
-     <groupId>com.sun.xml.bind</groupId>
-     <artifactId>jaxb-xjc</artifactId>
-@@ -91,6 +85,45 @@
-         <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
-     </scm>
- 
-+    <dependencies>
-+      <dependency>
-+        <groupId>com.sun.codemodel</groupId>
-+        <artifactId>codemodel</artifactId>
-+        <version>2.6</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>com.sun.xml.dtd-parser</groupId>
-+        <artifactId>dtd-parser</artifactId>
-+        <version>1.2-SNAPSHOT</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>com.sun.istack</groupId>
-+        <artifactId>istack-commons-tools</artifactId>
-+        <version>2.6.1</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>relaxngDatatype</groupId>
-+        <artifactId>relaxngDatatype</artifactId>
-+        <scope>system</scope>
-+        <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
-+      </dependency>
-+      <dependency>
-+        <groupId>xml-resolver</groupId>
-+        <artifactId>xml-resolver</artifactId>
-+        <version>1.2</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>org.kohsuke.rngom</groupId>
-+        <artifactId>rngom</artifactId>
-+        <version>201103-SNAPSHOT</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>com.sun.xsom</groupId>
-+        <artifactId>xsom</artifactId>
-+        <version>20110809</version>
-+      </dependency>
-+    </dependencies>
-+
-     <dependencyManagement>
-         <dependencies>
-             <dependency>
diff --git a/debian/patches/dont-build-examples.patch b/debian/patches/dont-build-examples.patch
deleted file mode 100644
index 0c34924..0000000
--- a/debian/patches/dont-build-examples.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bc4b149aa582d1663db86141533477a3a7ca937e Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 18:04:52 +0100
-Subject: [PATCH 7/7] Don't build examples
-
----
- build.xml |   14 --------------
- 1 files changed, 0 insertions(+), 14 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 7b18a8e..4da31cb 100644
---- a/build.xml
-+++ b/build.xml
-@@ -880,20 +880,6 @@
- 
-         </parallel>
- 
--        <antcall target="process-sample.notinwspack"/>
--        <!-- copy samples -->
--        <mkdir dir="${jaxb.dist}/samples"/>
--        <copy todir="${jaxb.dist}/samples">
--          <fileset dir="${jaxb.root}/samples/work" defaultexcludes="yes">
--            <exclude name="CHANGELOG.txt"/>
--            <exclude name="**/build.golden.regexp"/>
--            <exclude name="**/.cvsignore"/>
--            <exclude name="**/sample.meta"/>
--            <exclude name="**/gen-src/**/*"/>
--            <exclude name="**/classes/**/*"/>
--          </fileset>
--        </copy>
--
-     </target>
- 
-     <target name="push-snapshot-to-maven">
--- 
-1.7.9
-
diff --git a/debian/patches/dont-bundle-other-jars.patch b/debian/patches/dont-bundle-other-jars.patch
deleted file mode 100644
index 3a862f7..0000000
--- a/debian/patches/dont-bundle-other-jars.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a954f6d671b5c3f334a80e803db77362500c1e48 Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 17:20:13 +0100
-Subject: [PATCH 4/5] Don't bundle other jars
-
----
- build.xml |    7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 12631a1..4dda9ef 100644
---- a/build.xml
-+++ b/build.xml
-@@ -830,7 +830,6 @@
-                       <fileset dir="${runtime-fi.classes}"/>
-                       <fileset dir="${runtime-staxex.classes}"/>
-                       <fileset dir="${runtime.src}" includes="META-INF/**/*" />
--                      <zipgroupfileset dir="${jaxb.libs.runtime2}" includes="*.jar" />
-                   </jar>
-               </sequential>
- 
-@@ -854,19 +853,13 @@ Class-Path: ${manifest.classpath}
-                     <mapper type="glob" from="*.java" to="*.java_" />
-                   </copy>
- 
--                  <mkdir dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
--                  <unzip dest="${jaxb.root}/build/jaxb-xjc-rejar">
--                    <fileset dir="${jaxb.libs.compiler}" includes="*.jar" />
--                  </unzip>
-                   <jar jarfile="${jaxb.dist}/lib/jaxb-xjc.jar"
-                        manifest="${xjc.root}/manifest.xjc"
-                        duplicate="fail">
-                       <!-- can't use zipgroupfileset because of the duplicate LICENSE.txt -->
--                      <fileset dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
-                       <fileset dir="${xjc.classes}"/>
-                       <metainf dir="${xjc.src}/META-INF" />
-                   </jar>
--                  <delete dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
-               </sequential>
- 
-               <!-- copy bin scripts -->
--- 
-1.7.9
-
diff --git a/debian/patches/dont-generate-1.0-runtime.patch b/debian/patches/dont-generate-1.0-runtime.patch
deleted file mode 100644
index 81504cf..0000000
--- a/debian/patches/dont-generate-1.0-runtime.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2dd0e1c44601db267fab47fa903c3f478d624d53 Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 17:11:14 +0100
-Subject: [PATCH 2/5] Don't generate 1.0 runtime
-
----
- build.xml |   23 +----------------------
- 1 files changed, 1 insertions(+), 22 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 7e95870..12631a1 100644
---- a/build.xml
-+++ b/build.xml
-@@ -798,7 +798,7 @@
-        
-     <!-- generate a distribution -->
-     <target name="dist"
--            depends="compile, integrate-1.0-compiler"
-+            depends="compile"
-             description="create a distribution in jaxb-ri/dist">
-         <mkdir dir="${jaxb.dist}" />
-         <mkdir dir="${jaxb.dist}/bin" />
-@@ -834,25 +834,6 @@
-                   </jar>
-               </sequential>
- 
--              <!-- JAXB 1.0 runtime jar -->
--              <!-- generate jaxb1-impl.jar for 1.0 runtime -->
--              <!-- include the contents of the old jaxb-libs.jar -->
--              <sequential>
--                  <createManifest file="${runtime.root}/build/manifest.rt1" extensionName="com.sun.xml.bind" />
--                  <mkdir dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
--                  <unzip dest="${jaxb.root}/build/jaxb-1-impl-rejar">
--                    <fileset dir="${jaxb.libs.runtime}" includes="*.jar" />
--                  </unzip>
--                  <jar jarfile="${jaxb.dist}/lib/jaxb1-impl.jar"
--                       manifest="${runtime.root}/build/manifest.rt1">
--                      <!-- can't use zipgroupfileset because of the duplicate version.properties -->
--                      <fileset dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
--                      <fileset dir="${runtime-deprecated.classes}"/>
--                  </jar>
--                  <delete dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
--              </sequential>
--
--
-               <!-- generate jaxb-xjc.jar: xjc, and schemagen subprojects -->
-               <sequential>
-                   <createManifest file="${xjc.root}/manifest.xjc" extensionName="com.sun.tools.xjc" />
-@@ -884,8 +865,6 @@ Class-Path: ${manifest.classpath}
-                       <fileset dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
-                       <fileset dir="${xjc.classes}"/>
-                       <metainf dir="${xjc.src}/META-INF" />
--                      <!-- bundle the 1.0 compiler in the side directory -->
--                      <zipfileset dir="${xjc10.classes}/.." />
-                   </jar>
-                   <delete dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
-               </sequential>
--- 
-1.7.9
-
diff --git a/debian/patches/dont-generate-jing-rnc-driver.patch b/debian/patches/dont-generate-jing-rnc-driver.patch
deleted file mode 100644
index 17b709a..0000000
--- a/debian/patches/dont-generate-jing-rnc-driver.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2fad64699dd922ae6c78575b4b32f621461544a5 Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 17:16:56 +0100
-Subject: [PATCH 3/5] Don't generate Jing RNC driver
-
----
- tools/build.xml |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/tools/build.xml b/tools/build.xml
-index d304db4..0723987 100644
---- a/tools/build.xml
-+++ b/tools/build.xml
-@@ -53,14 +53,12 @@
-     <target name="compile" depends="compile-for-source"
-             description="build tools and deploy them into necessary locations">
-         <ant dir="${jaxb.root}/tools/pretty-printer" />
--        <ant dir="${jaxb.root}/tools/jing-rnc-driver"/>
-     </target>
-     
-     <target name="clean">
-         <ant dir="${jaxb.root}/tools/source-tidy"          target="clean"/>
-         <ant dir="${jaxb.root}/tools/webapp-commons"       target="clean"/>
-         <ant dir="${jaxb.root}/tools/pretty-printer"       target="clean"/>
--        <ant dir="${jaxb.root}/tools/jing-rnc-driver"      target="clean"/>
-         <ant dir="${jaxb.root}/tools/xmllint"              target="clean"/>
-     </target>
- </project>
--- 
-1.7.9
-
diff --git a/debian/patches/dont-use-internal-resolver.patch b/debian/patches/dont-use-internal-resolver.patch
deleted file mode 100644
index 240e5c0..0000000
--- a/debian/patches/dont-use-internal-resolver.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5f4055b0b8792440e3f004ff189e08e05c5a1d44 Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 17:08:06 +0100
-Subject: [PATCH 1/5] Don't use internal resolver
-
----
- xjc/src/com/sun/tools/xjc/Options.java |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xjc/src/com/sun/tools/xjc/Options.java b/xjc/src/com/sun/tools/xjc/Options.java
-index 78c9cf4..d8247de 100644
---- a/xjc/src/com/sun/tools/xjc/Options.java
-+++ b/xjc/src/com/sun/tools/xjc/Options.java
-@@ -67,8 +67,8 @@ import com.sun.codemodel.CodeWriter;
- import com.sun.codemodel.JPackage;
- import com.sun.codemodel.writer.FileCodeWriter;
- import com.sun.codemodel.writer.PrologCodeWriter;
--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 com.sun.tools.xjc.api.ClassNameAllocator;
- import com.sun.tools.xjc.api.SpecVersion;
- import com.sun.tools.xjc.generator.bean.field.FieldRendererFactory;
--- 
-1.7.9
-
diff --git a/debian/patches/dont-use-prebuilt-javadocs.patch b/debian/patches/dont-use-prebuilt-javadocs.patch
deleted file mode 100644
index f905447..0000000
--- a/debian/patches/dont-use-prebuilt-javadocs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 463def43292b22ba9137b79fe98a96fe545725ed Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 18:04:19 +0100
-Subject: [PATCH 6/7] Don't use prebuilt javadocs
-
----
- build.xml |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index a0759eb..7b18a8e 100644
---- a/build.xml
-+++ b/build.xml
-@@ -880,9 +880,6 @@
- 
-         </parallel>
- 
--        <unzip src="${jaxb.libs.redist}/jaxb-api-doc.zip" dest="${jaxb.dist}/docs/api"/>
--        <antcall target="docs" />
--
-         <antcall target="process-sample.notinwspack"/>
-         <!-- copy samples -->
-         <mkdir dir="${jaxb.dist}/samples"/>
--- 
-1.7.9
-
diff --git a/debian/patches/fix-javadoc-build.diff b/debian/patches/fix-javadoc-build.diff
deleted file mode 100644
index 4a75a77..0000000
--- a/debian/patches/fix-javadoc-build.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Timo Aaltonen <tjaalton at ubuntu.com>
-Description: replace the javadoc target with something we can use, modify classpath to fit
---- a/build.xml
-+++ b/build.xml
-@@ -137,30 +137,21 @@
-         <fileset dir="${jaxb.libs.redist}" includes="*.jar"/>
-         <fileset dir="${jaxb.libs.rebundle}" includes="**/*.jar"/>
-         <fileset dir="${jaxb.libs.util}" includes="*.jar" excludes="ant.jar"/>
-+        <fileset dir="dist/lib" includes="*.jar"/>
-+        <fileset dir="/usr/share/java" includes="*.jar"/>
-     </path>
- 
-     <target name="javadoc">
--        <ant dir="runtime" target="javadoc" />
--        <ant dir="xjc"     target="javadoc" />
--        <zip zipfile="${jaxb.dist}/lib/jaxb-impl-javadoc.jar">
--            <fileset dir="${runtime.root}/build/api"/>
--        </zip>
--        <zip zipfile="${jaxb.dist}/lib/jaxb-xjc-javadoc.jar">
--            <fileset dir="${xjc.root}/build/javadoc"/>
--        </zip>
--        
--        <unzip src="${jaxb.dist}/lib/jaxb1-impl-src.zip" dest="${jaxb.build}/jaxb1src"/>
--        <mkdir dir="${jaxb.build}/jaxb1api" />
--        <javadoc destdir="${jaxb.build}/jaxb1api" use="true" defaultexcludes="yes"
--            author="false" version="false" windowtitle="JAXB 1 RI runtime"
--            useexternalfile="true" access="public">
--            <fileset dir="${jaxb.build}/jaxb1src" includes="com/sun/xml/bind/*.java"/>
-+        <mkdir dir="apidocs" />
-+        <javadoc destdir="apidocs">
-+            <fileset dir="runtime/src" includes="**/*.java"/>
-+            <fileset dir="xjc/src" includes="**/*.java"/>
-             <classpath refid="javac.classpath"/>
--            <arg value="-quiet"/>
-         </javadoc>
--        <zip zipfile="${jaxb.dist}/lib/jaxb1-impl-javadoc.jar">
--            <fileset dir="${jaxb.build}/jaxb1api"/>
--        </zip>
-+        <copy todir="apidocs">
-+            <fileset dir="runtime/src" includes="**/doc-files/**/*"/>
-+            <fileset dir="xjc/src" includes="**/doc-files/**/*"/>
-+        </copy>
-     </target>
- 
-     <target name="src-zip" depends="init-standalone,dist"
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
deleted file mode 100644
index 9f597c2..0000000
--- a/debian/patches/java8-compatibility.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fixes the compatibility with Java 8
-Origin: backport, https://github.com/gf-metro/jaxb/blob/8c3b56a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/model/nav/ApNavigator.java#L382
---- a/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java
-+++ b/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java
-@@ -387,6 +387,18 @@
-         public TypeKind getKind() {
-             throw new IllegalStateException();
-         }
-+
-+        public List<? extends javax.lang.model.element.AnnotationMirror> getAnnotationMirrors() {
-+            throw new IllegalStateException();
-+        }
-+
-+        public <A extends java.lang.annotation.Annotation> A getAnnotation(Class<A> annotationType) {
-+            throw new IllegalStateException();
-+        }
-+
-+        public <A extends java.lang.annotation.Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
-+            throw new IllegalStateException();
-+        }
-     };
- 
-     public Location getClassLocation(TypeElement typeElement) {
diff --git a/debian/patches/remove-classpath-from-manifests.patch b/debian/patches/remove-classpath-from-manifests.patch
deleted file mode 100644
index 8933dfc..0000000
--- a/debian/patches/remove-classpath-from-manifests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1bcc5546d6100f1cc41f6e1cb9be113ce967d737 Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-Date: Sat, 10 Mar 2012 17:24:00 +0100
-Subject: [PATCH 5/5] Remove classpath from manifests
-
----
- build.xml |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 4dda9ef..a0759eb 100644
---- a/build.xml
-+++ b/build.xml
-@@ -820,9 +820,6 @@
-               <!-- generate jaxb-impl.jar for 2.0 runtime -->
-               <sequential>
-                   <createManifest file="${runtime.root}/build/manifest.rt" extensionName="com.sun.xml.bind" />
--                  <manifest mode="update" file="${runtime.root}/build/manifest.rt">
--                    <attribute name="Class-Path" value="jaxb-api.jar activation.jar jsr173_1.0_api.jar jaxb1-impl.jar" /> <!-- added for JES4 script compatibility -->
--                  </manifest>
-                   <jar jarfile="${jaxb.dist}/lib/jaxb-impl.jar"
-                        manifest="${runtime.root}/build/manifest.rt"
-                        duplicate="fail">
-@@ -845,7 +842,6 @@
-                   <property name="manifest.classpath" value="jaxb-api.jar jaxb-impl.jar jsr173_1.0_api.jar activation.jar" />
-                   <echo file="${xjc.root}/manifest.xjc" append="true"
- >Main-Class: com.sun.tools.xjc.XJCFacade
--Class-Path: ${manifest.classpath}
- 
- </echo>
-                   <copy todir="${xjc.classes}">
--- 
-1.7.9
-
diff --git a/debian/patches/series b/debian/patches/series
index 098b739..79f0236 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1 @@
-dont-use-internal-resolver.patch
-dont-generate-1.0-runtime.patch
-dont-generate-jing-rnc-driver.patch
-dont-bundle-other-jars.patch
-remove-classpath-from-manifests.patch
-add-dependencies.patch
-dont-use-prebuilt-javadocs.patch
-dont-build-examples.patch
-fix-javadoc-build.diff
-java8-compatibility.patch
+01-reactor-dependencies.patch
diff --git a/debian/rules b/debian/rules
index 40c2d2b..36957be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,19 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-
-# Put depended upon jars in here
-# export CLASSPATH=
-
-VERSION = $(shell dpkg-parsechangelog |grep Version| sed 's/.*: //;s/-.*//')
-
 %:
-	dh $@ --with javahelper
+	dh $@ --buildsystem=maven --with javahelper
 
 override_dh_auto_build:
-	mkdir tools/lib/redist
-	# these are best handled here
-	ln -s /usr/share/java/args4j.jar tools/lib/util/args4j.jar
-	ln -s /usr/share/java/codemodel.jar tools/lib/rebundle/compiler/codemodel.jar
-	ln -s /usr/share/java/codemodel-annotation-compiler.jar tools/lib/util/codemodel-annotation-compiler.jar
-	ln -s /usr/share/java/dom4j.jar tools/lib/util/dom4j.jar
-	ln -s /usr/share/java/dtd-parser.jar tools/lib/rebundle/compiler/dtd-parser.jar
-	ln -s /usr/share/java/FastInfoset.jar tools/lib/util/FastInfoset.jar
-	ln -s /usr/share/java/isorelax.jar tools/lib/rebundle/runtime/isorelax.jar
-	ln -s /usr/share/java/istack-commons-runtime.jar tools/lib/rebundle/runtime2/istack-commons-runtime.jar
-	ln -s /usr/share/java/istack-commons-tools.jar tools/lib/rebundle/compiler/istack-commons-tools.jar
-	ln -s /usr/share/java/jaxb-api.jar tools/lib/redist/jaxb-api.jar
-	ln -s /usr/share/java/jing.jar tools/lib/util/jing.jar
-	ln -s /usr/share/java/msv-core.jar tools/lib/rebundle/runtime/msv.jar
-	ln -s /usr/share/java/relaxngcc.jar tools/lib/util/relaxngcc.jar
-	ln -s /usr/share/java/relaxngDatatype.jar tools/lib/rebundle/runtime/relaxngDatatype.jar
-	ln -s /usr/share/java/relaxngDatatype.jar tools/lib/rebundle/compiler/relaxngDatatype.jar
-	ln -s /usr/share/java/rngom.jar tools/lib/rebundle/compiler/rngom.jar
-	ln -s /usr/share/java/stax-ex.jar tools/lib/util/stax-ex.jar
-	ln -s /usr/share/java/txw2.jar tools/lib/rebundle/runtime2/txw2.jar
-	ln -s /usr/share/java/txwc2.jar tools/lib/util/txwc2.jar
-	ln -s /usr/share/java/xml-resolver.jar tools/lib/rebundle/compiler/resolver.jar
-	ln -s /usr/share/java/xsom.jar tools/lib/rebundle/compiler/xsom.jar
-
+	dh_auto_build -- -f jaxb-ri/pom.xml package javadoc:aggregate -DskipTests
 
-	dh_auto_build -- \
-		-Dbuild.sysclasspath=last -Dbuild.number=1 \
-		-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-		dist javadoc
+override_dh_auto_test:
+	dh_auto_test -- -f jaxb-ri/pom.xml test
 
-clean::
-	dh_clean
-	jh_clean
-	mh_clean
-	rm -rf apgen/build \
-		apidocs \
-		dist \
-		runtime*/build  \
-		tools/*/build \
-		xjc/build
-	rm -rf `find . -name "*.jar"`
-	rm -rf `find . -name "*.class"`
-	rm -f xjc/manifest.xjc
-	rm -rf tools/lib/redist
+override_dh_auto_install:
+	dh_auto_install -- -f jaxb-ri/pom.xml
 
-override_dh_install:
-	dh_install
-	mh_installpoms
-	mh_installjar -plibjaxb-java -l jaxb-impl.pom dist/lib/jaxb-impl.jar
-	mh_installjar -plibjaxb-java -l jaxb-xjc.pom dist/lib/jaxb-xjc.jar
+override_dh_auto_clean:
+	dh_auto_clean -- -f jaxb-ri/pom.xml clean
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename

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



More information about the pkg-java-commits mailing list