[jaxb] 13/24: Added the missing dependency versions required by the use of --no-parent

[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 46dac58b9f1edf6a3ced4e4e23a48312a9b40f10
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 15:42:18 2017 +0200

    Added the missing dependency versions required by the use of --no-parent
---
 .../03-codemodel-dependencies-versions.patch       | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 52 insertions(+)

diff --git a/debian/patches/03-codemodel-dependencies-versions.patch b/debian/patches/03-codemodel-dependencies-versions.patch
new file mode 100644
index 0000000..69dde76
--- /dev/null
+++ b/debian/patches/03-codemodel-dependencies-versions.patch
@@ -0,0 +1,51 @@
+Description: Adds the missing dependency versions no longer inherited from
+ the parent pom since the --no-parent flag was used to avoid a dependency
+ between librngom-java/libtxw2-java/libcodemodel-java and libjaxb-java
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
++++ b/jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
+@@ -63,6 +63,7 @@
+         <dependency>
+             <groupId>com.sun.istack</groupId>
+             <artifactId>istack-commons-tools</artifactId>
++            <version>debian</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>org.apache.ant</groupId>
+@@ -73,6 +74,7 @@
+         <dependency>
+             <groupId>org.apache.ant</groupId>
+             <artifactId>ant</artifactId>
++            <version>debian</version>
+             <scope>provided</scope>
+         </dependency>
+     </dependencies>
+--- a/jaxb-ri/txw/compiler/pom.xml
++++ b/jaxb-ri/txw/compiler/pom.xml
+@@ -82,6 +82,7 @@
+         <dependency>
+             <groupId>org.apache.ant</groupId>
+             <artifactId>ant</artifactId>
++            <version>debian</version>
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
+@@ -92,6 +93,7 @@
+         <dependency>
+             <groupId>com.sun.xsom</groupId>
+             <artifactId>xsom</artifactId>
++            <version>${project.version}</version>
+         </dependency>
+     </dependencies>
+ 
+--- a/jaxb-ri/external/rngom/pom.xml
++++ b/jaxb-ri/external/rngom/pom.xml
+@@ -84,6 +84,7 @@
+         <dependency>
+             <groupId>relaxngDatatype</groupId>
+             <artifactId>relaxngDatatype</artifactId>
++            <version>debian</version>
+         </dependency>
+         
+         <!-- Test -->
diff --git a/debian/patches/series b/debian/patches/series
index eb37ff5..2a1acd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-reactor-dependencies.patch
 02-args4j-compatibility.patch
+03-codemodel-dependencies-versions.patch

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