[Git][java-team/libapache-poi-java][master] 4 commits: Tightened the dependency on libcommons-compress-java (Closes: #923540)
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Mon Feb 14 16:01:40 GMT 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libapache-poi-java
Commits:
9d8e1de3 by Emmanuel Bourg at 2022-02-14T15:01:46+01:00
Tightened the dependency on libcommons-compress-java (Closes: #923540)
- - - - -
df8e7fc9 by Emmanuel Bourg at 2022-02-14T16:41:39+01:00
Fixed the build failure with Java 17 (Closes: #981973)
- - - - -
12cb9fb1 by Emmanuel Bourg at 2022-02-14T17:00:36+01:00
Preserve the compatibility with Java 8 when building with recent JDKs
- - - - -
cf1d7f60 by Emmanuel Bourg at 2022-02-14T17:01:04+01:00
Upload to unstable
- - - - -
6 changed files:
- debian/ant.properties
- debian/changelog
- debian/control
- + debian/patches/13_rhino-script-engine.patch
- + debian/patches/14_language-level.patch
- debian/patches/series
Changes:
=====================================
debian/ant.properties
=====================================
@@ -1,3 +1,6 @@
+jdk.version.source = 8
+jdk.version.target = 8
+
disconnected=true
dsig.bouncycastle-prov.jar=/usr/share/java/bcprov.jar
dsig.bouncycastle-pkix.jar=/usr/share/java/bcpkix.jar
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libapache-poi-java (4.0.1-3) unstable; urgency=medium
+
+ * Fixed the build failure with Java 17 (Closes: #981973)
+ * Tightened the dependency on libcommons-compress-java (Closes: #923540)
+ * Preserve the compatibility with Java 8 when building with recent JDKs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 14 Feb 2022 17:00:55 +0100
+
libapache-poi-java (4.0.1-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -16,13 +16,14 @@ Build-Depends:
libbcpkix-java (>= 1.54),
libcommons-codec-java,
libcommons-collections4-java,
- libcommons-compress-java,
+ libcommons-compress-java (>= 1.18),
libcommons-logging-java,
libcommons-math3-java,
libcurvesapi-java,
libdom4j-java,
libjaxb-java,
liblog4j1.2-java,
+ librhino-java (>= 1.7.7.2-3~),
libxmlbeans-java (>= 3.0.2),
libxml-security-java (>= 2.0),
maven-repo-helper,
@@ -37,7 +38,7 @@ Architecture: all
Depends:
libcommons-codec-java,
libcommons-collections4-java,
- libcommons-compress-java,
+ libcommons-compress-java (>= 1.18),
libcommons-logging-java,
libcommons-math3-java,
libcurvesapi-java,
=====================================
debian/patches/13_rhino-script-engine.patch
=====================================
@@ -0,0 +1,49 @@
+Description: Run the script snippets in the Ant file with Rhino to fix the build failure with Java 17
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/981973
+--- a/build.xml
++++ b/build.xml
+@@ -70,6 +70,7 @@
+ <property name="java.source.encoding" value="UTF-8"/>
+
+ <scriptdef name="propertyreset" language="javascript"
++ classpath="/usr/share/java/rhino.jar"
+ description="Allows to assign @{property} new value">
+ <attribute name="name"/>
+ <attribute name="value"/>
+@@ -578,7 +579,7 @@
+ <echo message="Using Ant: ${ant.version} from ${ant.home}, Ant detected Java ${ant.java.version} (may be different than actual Java sometimes...)" />
+ <echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
+
+- <scriptdef name="release_tag" language="javascript">
++ <scriptdef name="release_tag" language="javascript" classpath="/usr/share/java/rhino.jar">
+ var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_");
+ project.setProperty("RELEASE_TAG", rel);
+ </scriptdef>
+@@ -2556,7 +2557,7 @@
+ <format property="tstamp_next" pattern="yyyy-MM" offset="3" unit="month"/>
+ </tstamp>
+
+- <scriptdef name="getnextrel" language="javascript">
++ <scriptdef name="getnextrel" language="javascript" classpath="/usr/share/java/rhino.jar">
+ var relCurr = new String(project.getProperty("version.id"));
+ var relNext = relCurr.replace(/[0-9]+$/, function(lastNum){ return new String(new Number(lastNum)+1); });
+ project.setProperty("rel_next", relNext);
+@@ -2684,7 +2685,7 @@
+ </tstamp>
+
+
+- <scriptdef name="getnextrel" language="javascript">
++ <scriptdef name="getnextrel" language="javascript" classpath="/usr/share/java/rhino.jar">
+ var relPrev = new String(project.getProperty("version.id"))
+ .replace(/([0-9]+)[^0-9]*$/, function(all,lastNum){ return new String(new Number(lastNum)-1); });
+ project.setProperty("rel_prev", relPrev);
+@@ -2760,6 +2761,7 @@
+ </macrodef>
+
+ <scriptdef name="bytes2mega" language="javascript"
++ classpath="/usr/share/java/rhino.jar"
+ description="Convert size in bytes to megabytes">
+ <attribute name="property"/>
+ <attribute name="bytes"/>
=====================================
debian/patches/14_language-level.patch
=====================================
@@ -0,0 +1,117 @@
+Description: Preserves Java 8 compatibility when building with recent JDKs
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -973,6 +973,7 @@
+
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ srcdir="${xmlbean.sources.dir}"
+ destdir="${xmlbean.classes.dir}"
+ encoding="${java.source.encoding}"
+@@ -1028,6 +1029,7 @@
+ <!-- compile the sources -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${main.output.dir}"
+ srcdir="${main.src}"
+ debug="${compile.debug}"
+@@ -1039,6 +1041,7 @@
+ <!-- compile the tests -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${main.output.test.dir}"
+ srcdir="${main.src.test}"
+ debug="${compile.debug}"
+@@ -1093,6 +1096,7 @@
+ <!-- compile the sources -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${scratchpad.output.dir}"
+ srcdir="${scratchpad.src}"
+ debug="${compile.debug}"
+@@ -1104,6 +1108,7 @@
+ <!-- compile the tests -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${scratchpad.output.test.dir}"
+ srcdir="${scratchpad.src.test}"
+ debug="${compile.debug}"
+@@ -1125,6 +1130,7 @@
+ <target name="compile-examples" depends="compile-main,compile-scratchpad,compile-ooxml">
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${examples.output.dir}"
+ srcdir="${examples.src}"
+ debug="${compile.debug}"
+@@ -1148,6 +1154,7 @@
+ <!-- compile the sources -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${ooxml.output.dir}"
+ srcdir="${ooxml.src}"
+ debug="${compile.debug}"
+@@ -1162,6 +1169,7 @@
+ <!-- compile the tests -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${ooxml.output.test.dir}"
+ srcdir="${ooxml.src.test}"
+ debug="${compile.debug}"
+@@ -1189,6 +1197,7 @@
+ <!-- compile the sources -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${ooxml.output.dir}"
+ srcdir="${ooxml.src}"
+ debug="${compile.debug}"
+@@ -1203,6 +1212,7 @@
+ <!-- compile the tests -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${ooxml.output.test.dir}"
+ srcdir="${ooxml.src.test}"
+ debug="${compile.debug}"
+@@ -1259,6 +1269,7 @@
+ <!-- compile the sources -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${excelant.output.dir}"
+ srcdir="${excelant.src}"
+ debug="${compile.debug}"
+@@ -1270,6 +1281,7 @@
+ <!-- compile the tests -->
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${excelant.output.test.dir}"
+ srcdir="${excelant.src.test}"
+ debug="${compile.debug}"
+@@ -1291,6 +1303,7 @@
+ <target name="compile-integration" depends="compile-scratchpad, compile-main, compile-ooxml, compile-examples">
+ <javac target="${jdk.version.class}"
+ source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ destdir="${integration.output.test.dir}"
+ srcdir="${integration.src.test}"
+ debug="${compile.debug}"
+@@ -1329,6 +1342,7 @@
+
+ <!-- Compile -->
+ <javac target="${jdk.version.class}" source="${jdk.version.source}"
++ release="${jdk.version.source}"
+ failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
+ srcdir="${main.output.dir}"
+ encoding="${java.source.encoding}" includeantruntime="false">
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,5 @@
bug-62996.patch
#ignore-test-errors.patch
+13_rhino-script-engine.patch
+14_language-level.patch
View it on GitLab: https://salsa.debian.org/java-team/libapache-poi-java/-/compare/0f466dc03d613390f68c48b6664037619a854f73...cf1d7f60477b3a2c53d8306dd1fd26c2a48b4f88
--
View it on GitLab: https://salsa.debian.org/java-team/libapache-poi-java/-/compare/0f466dc03d613390f68c48b6664037619a854f73...cf1d7f60477b3a2c53d8306dd1fd26c2a48b4f88
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/20220214/2cca795f/attachment.htm>
More information about the pkg-java-commits
mailing list