[jaxb] 15/24: Refreshed the patches

[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 b035c9e4e815e62dce53547486bd09fa629cf4aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 15:48:11 2017 +0200

    Refreshed the patches
---
 debian/changelog                                        |  2 +-
 debian/patches/01-reactor-dependencies.patch            | 12 ++++++------
 debian/patches/02-args4j-compatibility.patch            |  6 +++---
 debian/patches/03-codemodel-dependencies-versions.patch | 10 +---------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cb4638..46b9d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jaxb (2.2.10-1) UNRELEASED; urgency=medium
+jaxb (2.3.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/01-reactor-dependencies.patch b/debian/patches/01-reactor-dependencies.patch
index 479b83f..03e2af5 100644
--- a/debian/patches/01-reactor-dependencies.patch
+++ b/debian/patches/01-reactor-dependencies.patch
@@ -5,7 +5,7 @@ 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 @@
+@@ -67,6 +67,7 @@
          <dependency>
              <groupId>${project.groupId}</groupId>
              <artifactId>jaxb-core</artifactId>
@@ -15,7 +15,7 @@ Forwarded: not-needed
              <groupId>org.jvnet.staxex</groupId>
 --- a/jaxb-ri/runtime/jaxb1/pom.xml
 +++ b/jaxb-ri/runtime/jaxb1/pom.xml
-@@ -61,6 +61,7 @@
+@@ -63,6 +63,7 @@
          <dependency>
              <groupId>org.glassfish.jaxb</groupId>
              <artifactId>jaxb-runtime</artifactId>
@@ -25,17 +25,17 @@ Forwarded: not-needed
              <groupId>net.java.dev.msv</groupId>
 --- a/jaxb-ri/xjc/pom.xml
 +++ b/jaxb-ri/xjc/pom.xml
-@@ -65,6 +65,7 @@
+@@ -73,6 +73,7 @@
          <dependency>
              <groupId>${project.groupId}</groupId>
              <artifactId>jaxb-core</artifactId>
 +            <version>${project.version}</version>
          </dependency>
          <dependency>
-             <groupId>junit</groupId>
+             <groupId>org.jmockit</groupId>
 --- a/jaxb-ri/jxc/pom.xml
 +++ b/jaxb-ri/jxc/pom.xml
-@@ -68,14 +68,17 @@
+@@ -70,14 +70,17 @@
          <dependency>
              <groupId>${project.groupId}</groupId>
              <artifactId>jaxb-xjc</artifactId>
@@ -52,4 +52,4 @@ Forwarded: not-needed
 +            <version>${project.version}</version>
          </dependency>
          <dependency>
-             <groupId>com.sun</groupId>
+             <groupId>com.sun.istack</groupId>
diff --git a/debian/patches/02-args4j-compatibility.patch b/debian/patches/02-args4j-compatibility.patch
index 4c41c6c..3552bc8 100644
--- a/debian/patches/02-args4j-compatibility.patch
+++ b/debian/patches/02-args4j-compatibility.patch
@@ -131,11 +131,11 @@ Forwarded: no
          // otherwise sniff from the file extension
 --- a/jaxb-ri/txw/compiler/pom.xml
 +++ b/jaxb-ri/txw/compiler/pom.xml
-@@ -87,6 +87,7 @@
+@@ -93,6 +93,7 @@
          <dependency>
              <groupId>args4j</groupId>
              <artifactId>args4j</artifactId>
 +            <version>debian</version>
          </dependency>
-         <dependency>
-             <groupId>com.sun.xsom</groupId>
+     </dependencies>
+ 
diff --git a/debian/patches/03-codemodel-dependencies-versions.patch b/debian/patches/03-codemodel-dependencies-versions.patch
index 69dde76..d45ba6e 100644
--- a/debian/patches/03-codemodel-dependencies-versions.patch
+++ b/debian/patches/03-codemodel-dependencies-versions.patch
@@ -23,7 +23,7 @@ Forwarded: not-needed
      </dependencies>
 --- a/jaxb-ri/txw/compiler/pom.xml
 +++ b/jaxb-ri/txw/compiler/pom.xml
-@@ -82,6 +82,7 @@
+@@ -88,6 +88,7 @@
          <dependency>
              <groupId>org.apache.ant</groupId>
              <artifactId>ant</artifactId>
@@ -31,14 +31,6 @@ Forwarded: not-needed
              <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 @@

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