[Git][java-team/jaxb][master] 3 commits: Build the jaxb-jxc-jdk9 and jaxb-xjc-jdk9 modules
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jul 24 19:32:17 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jaxb
Commits:
20d77e08 by Emmanuel Bourg at 2018-07-24T20:30:51+02:00
Build the jaxb-jxc-jdk9 and jaxb-xjc-jdk9 modules
- - - - -
4c2f920b by Emmanuel Bourg at 2018-07-24T20:30:51+02:00
Standards-Version updated to 4.1.5
- - - - -
b71ab443 by Emmanuel Bourg at 2018-07-24T20:31:33+02:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/libjaxb-java.poms
- debian/patches/01-reactor-dependencies.patch
- + debian/patches/08-java10-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jaxb (2.3.0.1-4) unstable; urgency=medium
+
+ * Team upload.
+ * Build the jaxb-jxc-jdk9 and jaxb-xjc-jdk9 modules
+ * Standards-Version updated to 4.1.5
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 24 Jul 2018 20:31:24 +0200
+
jaxb (2.3.0.1-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
libmaven-javadoc-plugin-java,
librelaxng-datatype-java,
maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
Vcs-Git: https://salsa.debian.org/java-team/jaxb.git
Vcs-Browser: https://salsa.debian.org/java-team/jaxb
Homepage: https://javaee.github.io/jaxb-v2/
=====================================
debian/libjaxb-java.poms
=====================================
--- a/debian/libjaxb-java.poms
+++ b/debian/libjaxb-java.poms
@@ -8,6 +8,8 @@ jaxb-ri/jxc/pom.xml
jaxb-ri/runtime/pom.xml
jaxb-ri/runtime/impl/pom.xml --relocate=com.sun.xml.bind:jaxb-impl
jaxb-ri/xjc/pom.xml
+jaxb-ri/jaxb-jxc-jdk9/pom.xml
+jaxb-ri/jaxb-xjc-jdk9/pom.xml
jaxb-ri/codemodel/pom.xml --no-parent --package=libcodemodel-java
jaxb-ri/codemodel/codemodel/pom.xml --package=libcodemodel-java --relocate=com.sun.codemodel:codemodel
=====================================
debian/patches/01-reactor-dependencies.patch
=====================================
--- a/debian/patches/01-reactor-dependencies.patch
+++ b/debian/patches/01-reactor-dependencies.patch
@@ -51,3 +51,49 @@ Forwarded: not-needed
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
+--- a/jaxb-ri/jaxb-xjc-jdk9/pom.xml
++++ b/jaxb-ri/jaxb-xjc-jdk9/pom.xml
+@@ -61,6 +61,7 @@
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-xjc</artifactId>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+@@ -92,6 +93,7 @@
+ <dependency>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>rngom</artifactId>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+--- a/jaxb-ri/jaxb-jxc-jdk9/pom.xml
++++ b/jaxb-ri/jaxb-jxc-jdk9/pom.xml
+@@ -61,6 +61,7 @@
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-jxc</artifactId>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+@@ -72,14 +73,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.istack</groupId>
=====================================
debian/patches/08-java10-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/08-java10-compatibility.patch
@@ -0,0 +1,80 @@
+Description: Enables the Java 9 profile with later releases of the JDK
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jaxb-ri/bundles/core/pom.xml
++++ b/jaxb-ri/bundles/core/pom.xml
+@@ -87,7 +87,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+--- a/jaxb-ri/bundles/runtime/pom.xml
++++ b/jaxb-ri/bundles/runtime/pom.xml
+@@ -81,7 +81,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+--- a/jaxb-ri/core/pom.xml
++++ b/jaxb-ri/core/pom.xml
+@@ -83,7 +83,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+--- a/jaxb-ri/jxc/pom.xml
++++ b/jaxb-ri/jxc/pom.xml
+@@ -221,7 +221,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+--- a/jaxb-ri/pom.xml
++++ b/jaxb-ri/pom.xml
+@@ -636,7 +636,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <modules>
+ <module>jaxb-jxc-jdk9</module>
+--- a/jaxb-ri/runtime/impl/pom.xml
++++ b/jaxb-ri/runtime/impl/pom.xml
+@@ -106,7 +106,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+--- a/jaxb-ri/xjc/pom.xml
++++ b/jaxb-ri/xjc/pom.xml
+@@ -258,7 +258,7 @@
+ <profile>
+ <id>jdk9-setup</id>
+ <activation>
+- <jdk>9</jdk>
++ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04-xml-resolver-compatibility.patch
06-ignore-osgi-test-modules.patch
07-fix-xjc-task.patch
+08-java10-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/jaxb/compare/6d070120fcbeaf764d686fc4e1e8b88f848f4df4...b71ab443f5a17175835400becdb49224a4f7a9e1
--
View it on GitLab: https://salsa.debian.org/java-team/jaxb/compare/6d070120fcbeaf764d686fc4e1e8b88f848f4df4...b71ab443f5a17175835400becdb49224a4f7a9e1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180724/98a46fdc/attachment.html>
More information about the pkg-java-commits
mailing list