[Git][java-team/libxalan2-java][master] 8 commits: Switch to compat level 11.
Markus Koschany
gitlab at salsa.debian.org
Fri May 11 17:34:22 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / libxalan2-java
Commits:
94fc41df by Markus Koschany at 2018-05-11T14:45:17+02:00
Switch to compat level 11.
- - - - -
4b905239 by Markus Koschany at 2018-05-11T14:45:28+02:00
Declare compliance with Debian Policy 4.1.4.
- - - - -
aad407ad by Markus Koschany at 2018-05-11T14:48:55+02:00
Use source/target 1.7.
- - - - -
47857d12 by Markus Koschany at 2018-05-11T15:46:06+02:00
Add java10.patch
- - - - -
3b286d40 by Markus Koschany at 2018-05-11T18:25:17+02:00
verbose
- - - - -
ac0269f7 by Markus Koschany at 2018-05-11T18:27:56+02:00
Remove verbose option again.
- - - - -
ad0d9a63 by Markus Koschany at 2018-05-11T18:29:48+02:00
Update changelog
- - - - -
d1080c43 by Markus Koschany at 2018-05-11T18:30:10+02:00
Update patch header
- - - - -
6 changed files:
- debian/ant.properties
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/java10.patch
- debian/patches/series
Changes:
=====================================
debian/ant.properties
=====================================
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -13,5 +13,5 @@ build.boot.class.path=/usr/share/java/jaxp-1.3.jar
# Ensure that source and target are 1.5
# For backwards compat on Java 7
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
+ant.build.javac.source=1.7
+ant.build.javac.target=1.7
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxalan2-java (2.7.2-2) unstable; urgency=medium
+
+ * Team upload.
+ * Switch to compat level 11.
+ * Declare compliance with Debian Policy 4.1.4.
+ * Use source/target 1.7.
+ * Add java10.patch and fix FTBFS with Java 9 and Java 10. The bootclasspath
+ option was removed upstream. (Closes: #893295)
+
+ -- Markus Koschany <apo at debian.org> Fri, 11 May 2018 18:28:08 +0200
+
libxalan2-java (2.7.2-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Marcus Better <marcus at better.se>,
Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: ant (>= 1.6.3),
cup,
- debhelper (>= 10),
+ debhelper (>= 11),
default-jdk,
javahelper,
jlex,
@@ -18,7 +18,7 @@ Build-Depends: ant (>= 1.6.3),
libstylebook-java (>> 1.0~b3~svn20061109-4),
libxerces2-java (>= 2.8.0),
maven-repo-helper
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxalan2-java.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxalan2-java.git
Homepage: http://xalan.apache.org/xalan-j/
=====================================
debian/patches/java10.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10.patch
@@ -0,0 +1,243 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 11 May 2018 15:36:28 +0200
+Subject: java10
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893295
+Forwarded: no
+---
+ build.xml | 52 +++++++++++++++++++++++-----------------------------
+ 1 file changed, 23 insertions(+), 29 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 8f46cf1..e97368d 100644
+--- a/build.xml
++++ b/build.xml
+@@ -233,6 +233,7 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <pathelement location="${build.serializer.jar}" />
+ <pathelement location="${parser.jar}" />
+ <pathelement path="${java.class.path}" />
++ <pathelement path="${build.boot.class.path}" />
+ </path>
+ <path id="xslt.boot.class.path">
+ <!-- Put this version of xalan in front of the jdk's for JDK 1.4+ -->
+@@ -394,7 +395,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <exclude name="**/IncrementalSAXSource_Xerces.java"
+ unless="xerces.present" />
+ <classpath refid="compile.class.path" />
+- <bootclasspath refid="xslt.boot.class.path" />
+ </javac>
+ <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
+ <copy todir="${build.classes}">
+@@ -420,7 +420,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <include name="${xalan.reldir}/**/*.java" />
+ <exclude name="${xsltc.reldir}/**/*.java" />
+ <classpath refid="compile.class.path" />
+- <bootclasspath refid="xslt.boot.class.path" />
+ <!--
+ <sourcepath refid="compile.source.path" />
+ -->
+@@ -465,7 +464,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="xsltc.class.path" />
+- <bootclasspath refid="xslt.boot.class.path" />
+ </javac>
+ <!-- These tricky uptodate statements hopefully determine if we
+ actually need to generate the java_cup and jlex files
+@@ -496,7 +494,7 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <jvmarg value="-Djava.awt.headless=true"/>
+ <classpath refid="xsltc.class.path" />
+ <!-- need to bootclasspath java_cup for JDKs that include JavaCupRedirect -->
+- <jvmarg value="-Xbootclasspath/p:${java_cup.jar}${path.separator}${runtime.jar}"/>
++ <jvmarg value="-Xbootclasspath/a:${java_cup.jar}${path.separator}${runtime.jar}"/>
+ <!-- We're using JavaCupRedirect to call the java_cup application -->
+ <arg line="-parser XPathParser -expect 0
+ -stdin ${src.dir}/${xsltc.reldir}/compiler/xpath.cup"/>
+@@ -531,7 +529,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="xsltc.class.path" />
+- <bootclasspath refid="xslt.boot.class.path" />
+ </javac>
+ </target>
+
+@@ -545,7 +542,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="xsltc.class.path" />
+- <bootclasspath refid="xslt.boot.class.path" />
+ </javac>
+ </target>
+
+@@ -750,90 +746,90 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <!-- Since the samples are packageless, they must be compiled separately. -->
+ <javac srcdir="${samples.dir}/SimpleTransform"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/UseStylesheetPI"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/UseStylesheetParam"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/SAX2SAX"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/DOM2DOM"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/Pipe"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
++ debug="${build.debug}" >
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/UseXMLFilters"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/Trace"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/ApplyXPath"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/ApplyXPathDOM"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/trax"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/extensions"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/Validate"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/TransformThread"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+ <javac srcdir="${samples.dir}/XPathAPI"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ </javac>
+@@ -876,7 +872,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <javac srcdir="${samples.dir}/servlet"
+ destdir="${build.servlet}/WEB-INF/classes"
+ debug="${build.debug}"
+- bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ <classpath location="${servlet-api.jar}" />
+@@ -918,11 +913,11 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <javac srcdir="${samples.dir}/translets"
+ classpath="${java.class.path}:${build.xalan.jar}"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}"/>
+ <javac srcdir="${samples.dir}/CompiledJAXP"
+ destdir="${build.samples}" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}"/>
+ </target>
+
+@@ -935,7 +930,7 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <mkdir dir="${build.samples}/CompiledApplet"/>
+ <javac srcdir="${samples.dir}/CompiledApplet"
+ destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}"/>
+ <jar jarfile="${build.xsltc.applet.jar}"
+ basedir="${build.samples}/CompiledApplet"
+@@ -951,7 +946,7 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <mkdir dir="${build.samples}/CompiledBrazil"/>
+ <javac srcdir="${samples.dir}/CompiledBrazil"
+ destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath location="${brazil.jar}"/>
+ </javac>
+@@ -971,7 +966,7 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <mkdir dir="${build.samples}/CompiledEJB"/>
+ <javac srcdir="${samples.dir}/CompiledEJB"
+ destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath location="${javaee-api.jar}"/>
+ </javac>
+@@ -989,7 +984,7 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ <mkdir dir="${build.samples}/CompiledServlet"/>
+ <javac srcdir="${samples.dir}/CompiledServlet"
+ destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath location="${servlet-api.jar}"/>
+ </javac>
+@@ -1713,7 +1708,6 @@ $Id: build.xml 1581694 2014-03-26 04:54:28Z ggregory $
+ target="${compiler.target}" source="${compiler.source}">
+ <include name="${serializer.reldir}/**/*.java" />
+ <classpath refid="compile.class.path" />
+- <bootclasspath refid="xslt.boot.class.path" />
+ </javac>
+ <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
+ <copy todir="${serializer.build.classes}">
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
build.patch
+java10.patch
View it on GitLab: https://salsa.debian.org/java-team/libxalan2-java/compare/132e9ffb3643d900d8a1b98c2c4fe6e091e2e5af...d1080c4357c1922ba3b06e3a6edc7e352d20c506
---
View it on GitLab: https://salsa.debian.org/java-team/libxalan2-java/compare/132e9ffb3643d900d8a1b98c2c4fe6e091e2e5af...d1080c4357c1922ba3b06e3a6edc7e352d20c506
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/20180511/d2b698ab/attachment.html>
More information about the pkg-java-commits
mailing list