[Git][java-team/jython][master] Fix FTBFS against Java 11

Gilles Filippini gitlab at salsa.debian.org
Thu Nov 8 19:33:07 GMT 2018


Gilles Filippini pushed to branch master at Debian Java Maintainers / jython


Commits:
1e7326e8 by Gilles Filippini at 2018-11-06T22:02:40Z
Fix FTBFS against Java 11

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/00-missing-dep.patch
- debian/patches/01-classpath.patch
- debian/patches/javadoc-classpath.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jython (2.7.1+repack-5) unstable; urgency=medium
+
+  * Workaround JAXB removal from Java 11 (closes: #912473):
+    - Build-Depends: libjaxb-api-java
+    - Update patch 00-missing-dep.patch to add jaxb-api.jar to the classpath
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 06 Nov 2018 23:02:01 +0100
+
 jython (2.7.1+repack-4) unstable; urgency=medium
 
   [ Emmanuel Bourg ]


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>, Gilles Filippini <pini at debian.org>
-Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python
+Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python, libjaxb-api-java
 Build-Depends-Indep: default-jdk,
  dh-python,
  junit4,


=====================================
debian/patches/00-missing-dep.patch
=====================================
@@ -1,9 +1,9 @@
 Description: Adds antlr-runtime to the classpath
 Author: Emmanuel Bourg <ebourg at apache.org>
-Index: jython/build.xml
+Index: jython-2.7.1+repack/build.xml
 ===================================================================
---- jython.orig/build.xml
-+++ jython/build.xml
+--- jython-2.7.1+repack.orig/build.xml
++++ jython-2.7.1+repack/build.xml
 @@ -146,6 +146,7 @@ oracle.jar=C:/workspace/HEAD/for_develop
              <pathelement path="${extlibs.dir}/postgresql-42.1.1.jre7.jar" />
              <!-- pin to Antlr 3.1.3 until we upgrade parsing -->
@@ -12,3 +12,11 @@ Index: jython/build.xml
              <pathelement path="${extlibs.dir}/stringtemplate-3.2.1.jar" />
              <pathelement path="${extlibs.dir}/commons-compress-1.14.jar"/>
              <!-- pin to ASM 5.2 until we upgrade compilation -->
+@@ -167,6 +168,7 @@ oracle.jar=C:/workspace/HEAD/for_develop
+             <pathelement path="${extlibs.dir}/netty-handler-4.1.11.Final.jar"/>
+             <pathelement path="${extlibs.dir}/netty-resolver-4.1.11.Final.jar"/>
+             <pathelement path="${extlibs.dir}/netty-transport-4.1.11.Final.jar"/>
++            <pathelement path="${extlibs.dir}/jaxb-api.jar"/>
+         </path>
+ 
+         <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />


=====================================
debian/patches/01-classpath.patch
=====================================
@@ -1,10 +1,10 @@
 Description: patch build.xml to extract, re-arrange and re-inject
  classpaths. See debian/rules.
 Author: Gilles Filippini <pini at deian.org>
-Index: jython/build.xml
+Index: jython-2.7.1+repack/build.xml
 ===================================================================
---- jython.orig/build.xml
-+++ jython/build.xml
+--- jython-2.7.1+repack.orig/build.xml
++++ jython-2.7.1+repack/build.xml
 @@ -138,7 +138,7 @@ oracle.jar=C:/workspace/HEAD/for_develop
          <property name="junit.htmlreports" value="${dist.dir}/test-html-reports" />
  
@@ -14,9 +14,9 @@ Index: jython/build.xml
              <pathelement path="${extlibs.dir}/servlet-api-2.5.jar" />
              <pathelement path="${informix.jar}" />
              <pathelement path="${oracle.jar}" />
-@@ -169,12 +169,16 @@ oracle.jar=C:/workspace/HEAD/for_develop
-             <pathelement path="${extlibs.dir}/netty-resolver-4.1.11.Final.jar"/>
+@@ -170,12 +170,16 @@ oracle.jar=C:/workspace/HEAD/for_develop
              <pathelement path="${extlibs.dir}/netty-transport-4.1.11.Final.jar"/>
+             <pathelement path="${extlibs.dir}/jaxb-api.jar"/>
          </path>
 +        <pathconvert property="their.main.classpath" refid="their.main.classpath"/>
 +	<path id="main.classpath">
@@ -33,7 +33,7 @@ Index: jython/build.xml
              <pathelement path="${extlibs.dir}/asm-commons-5.2.jar" />
              <pathelement path="${extlibs.dir}/asm-util-5.2.jar" />
              <pathelement path="${extlibs.dir}/junit-4.10.jar" />
-@@ -182,6 +186,11 @@ oracle.jar=C:/workspace/HEAD/for_develop
+@@ -183,6 +187,11 @@ oracle.jar=C:/workspace/HEAD/for_develop
              <pathelement path="${compile.dir}" />
              <pathelement path="${cpptasks.jar.dir}" />
          </path>
@@ -45,7 +45,7 @@ Index: jython/build.xml
          <property name="jython.dev.jar" value="jython-dev.jar" />
          <property name="jython.deploy.jar" value="jython.jar" />
          <property name="jython.standalone.jar" value="jython-standalone.jar" />
-@@ -221,6 +230,13 @@ oracle.jar=C:/workspace/HEAD/for_develop
+@@ -222,6 +231,13 @@ oracle.jar=C:/workspace/HEAD/for_develop
          <fail unless="oracle.present" message="oracle jar not present" />
      </target>
  
@@ -59,7 +59,7 @@ Index: jython/build.xml
      <target name="dump-env" depends="init">
          <echo>.</echo>
          <echo>Build environment for ${ant.project.name}</echo>
-@@ -674,6 +690,7 @@ The readme text for the next release wil
+@@ -675,6 +691,7 @@ The readme text for the next release wil
                   excludes="org/python/expose/generate/**,org/python/version.properties"/>
            </nameunion>
            <manifest>
@@ -67,7 +67,7 @@ Index: jython/build.xml
                <attribute name="Main-Class" value="org.python.util.jython" />
                <attribute name="Built-By" value="${user.name}" />
                <!-- info section. ATTN: no blanks, no '.' in the names -->
-@@ -831,9 +848,6 @@ The readme text for the next release wil
+@@ -832,9 +849,6 @@ The readme text for the next release wil
  
      <target name="copy-javalib" unless="full-build">
          <copy todir="${dist.dir}/javalib">


=====================================
debian/patches/javadoc-classpath.patch
=====================================
@@ -1,8 +1,8 @@
-Index: jython/build.xml
+Index: jython-2.7.1+repack/build.xml
 ===================================================================
---- jython.orig/build.xml
-+++ jython/build.xml
-@@ -711,6 +711,7 @@ The readme text for the next release wil
+--- jython-2.7.1+repack.orig/build.xml
++++ jython-2.7.1+repack/build.xml
+@@ -712,6 +712,7 @@ The readme text for the next release wil
          <path id="javadoc.classpath">
              <pathelement path="${java.class.path}" />
              <pathelement path="${compile.dir}" />



View it on GitLab: https://salsa.debian.org/java-team/jython/commit/1e7326e88f2d860e2fa7da60f920c1fc8ee2ac19

-- 
View it on GitLab: https://salsa.debian.org/java-team/jython/commit/1e7326e88f2d860e2fa7da60f920c1fc8ee2ac19
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/20181108/ffb9344a/attachment.html>


More information about the pkg-java-commits mailing list