[Git][java-team/jaxb][master] Backported the fix for the xjc Ant task in non fork mode (Closes: #882525)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jaxb


Commits:
f2e6dcde by Emmanuel Bourg at 2018-05-29T16:13:07+02:00
Backported the fix for the xjc Ant task in non fork mode (Closes: #882525)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/07-fix-xjc-task.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jaxb (2.3.0.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Backported the fix for the xjc Ant task in non fork mode (Closes: #882525)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 May 2018 16:12:21 +0200
+
 jaxb (2.3.0.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/07-fix-xjc-task.patch
=====================================
--- /dev/null
+++ b/debian/patches/07-fix-xjc-task.patch
@@ -0,0 +1,35 @@
+Description: Fix XJC ant task to work without fork
+Origin, backport, https://github.com/javaee/jaxb-v2/pull/1170/commits/dad8495f19078cb05302132f83dafda5b3dfa98b
+Bug: https://github.com/javaee/jaxb-v2/issues/1144
+Bug-Debian: https://bugs.debian.org/882525
+--- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java
++++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java
+@@ -667,13 +667,15 @@
+             return;
+         }
+ 
+-        boolean ok = false;
+         try {
+             if (getFork()) {
+                 setupCommand();
+                 setupForkCommand("com.sun.tools.xjc.XJCFacade");
+                 int status = run(getCommandline().getCommandline());
+-                ok = (status == 0);
++                if (status != 0) {
++                    log("Command invoked: " + "xjc" + getCommandline().toString());
++                    throw new BuildException("xjc" + " failed", getLocation());
++                }
+             } else {
+                 if (getCommandline().getVmCommand().size() > 1) {
+                     log("JVM args ignored when same JVM is used.", Project.MSG_WARN);
+@@ -726,10 +728,6 @@
+                     }
+                 }
+             }
+-            if (!ok) {
+-                log("Command invoked: " + "xjc" + getCommandline().toString());
+-                throw new BuildException("xjc" + " failed", getLocation());
+-            }
+         } catch (BuildException e) {
+             log("failure in the XJC task. Use the Ant -verbose switch for more details");
+             if (failonerror)


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-dependencies-versions.patch
 04-xml-resolver-compatibility.patch
 06-ignore-osgi-test-modules.patch
+07-fix-xjc-task.patch



View it on GitLab: https://salsa.debian.org/java-team/jaxb/commit/f2e6dcde9fb2f81cdf2e24cf6e11a5085bef9b7e

-- 
View it on GitLab: https://salsa.debian.org/java-team/jaxb/commit/f2e6dcde9fb2f81cdf2e24cf6e11a5085bef9b7e
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/20180529/71a7d8f9/attachment.html>