Skip to content

Commit

Permalink
feat: update libapache-poi-java to 4.0.1
Browse files Browse the repository at this point in the history
Apache POI - Java API for Microsoft Documents

Issue: linuxdeepin/developer-center#3965
Log: update repo
  • Loading branch information
xzl01 committed May 7, 2024
1 parent b3781e4 commit ebc8470
Show file tree
Hide file tree
Showing 14 changed files with 399 additions and 22 deletions.
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

3 changes: 3 additions & 0 deletions debian/ant.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
62 changes: 53 additions & 9 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
libapache-poi-java (4.0.1-6) unstable; urgency=medium

* Team upload

[ Vladimir Petko ]
* d/p/17_commons-compress-upgrade.patch: apply upstream patch to resolve ftbfs
(Closes: #1065455).

-- Vladimir Petko <[email protected]> Thu, 07 Mar 2024 15:21:27 +1300

libapache-poi-java (4.0.1-5) unstable; urgency=medium

[ Pierre Gruet ]
* Team upload
* Providing classpaths of build jars in debian/libapache-poi-java.classpath
(Closes: #1012079)
* Raising Standards version to 4.6.1 (Rules-Requires-Root: no)
* Removing unneeded versioned dependencies in debian/control
* Replacing obsolete X-Comment field with Comment in d/copyright
* Trim trailing whitespace.
* Raising debian/watch format from 3 to 4.
* Adding missing dependencies to the binary package
* Apply multi-arch hints. + libapache-poi-java-doc: Add Multi-Arch: foreign.

[ tony mancill ]
* Add patch for BouncyCastle 1.77 (Closes: #1057167)
* Use UTC for build timestamp (Closes: #1039741)

-- tony mancill <[email protected]> Wed, 13 Dec 2023 13:42:30 -0800

libapache-poi-java (4.0.1-4) unstable; urgency=medium

* Compatibility with XMLBeans 4.0

-- Emmanuel Bourg <[email protected]> Mon, 16 May 2022 23:21:14 +0200

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 <[email protected]> Mon, 14 Feb 2022 17:00:55 +0100

libapache-poi-java (4.0.1-2) unstable; urgency=medium

* Team upload.
Expand Down Expand Up @@ -73,7 +117,7 @@ libapache-poi-java (3.10.1-4) unstable; urgency=medium
-- Emmanuel Bourg <[email protected]> Tue, 24 Jul 2018 13:55:38 +0200

libapache-poi-java (3.10.1-3) unstable; urgency=medium

* Team upload.

[ Emmanuel Bourg ]
Expand Down Expand Up @@ -146,7 +190,7 @@ libapache-poi-java (3.9-1) unstable; urgency=low
* Updated the debian/README.* files

[ tony mancill ]
* Update debian/copyright to DEP5 format; clarify license of
* Update debian/copyright to DEP5 format; clarify license of
chunks_parse_cmds.tbl. (Closes: #659067)

-- Emmanuel Bourg <[email protected]> Tue, 09 Jul 2013 23:10:21 +0200
Expand Down Expand Up @@ -262,7 +306,7 @@ libjakarta-poi-java (3.0.1-1) unstable; urgency=low

* New upstream release (closes: #436974)
* add myself to Uploaders
* add watch file
* add watch file

-- Rene Engelhard <[email protected]> Wed, 05 Sep 2007 00:27:43 +0200

Expand All @@ -279,7 +323,7 @@ libjakarta-poi-java (2.5.1-3) unstable; urgency=low

libjakarta-poi-java (2.5.1-2) unstable; urgency=low

* Upload to unstable
* Upload to unstable

-- Wolfgang Baer <[email protected]> Thu, 2 Feb 2006 15:37:06 +0100

Expand All @@ -288,13 +332,13 @@ libjakarta-poi-java (2.5.1-1) experimental; urgency=low
* New upstream release
* Move to main - build with kaffe
* Apache 2.0 License, adjusted debian/copyright
* Move package to pkg-java-maintainers for comaintenance,
* Move package to pkg-java-maintainers for comaintenance,
added Christian Bayle and myself as uploaders
* New build dependencies (some are also dependencies)
* New build dependencies (some are also dependencies)
libcommons-logging-java, liblog4j1.2-java, ant-optional, junit, cdbs,
libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
* Added compat file for debhelper 4 compatibility
* Updated README.Debian with information about different classpaths
* Updated README.Debian with information about different classpaths
dependend on used jakarta-poi jar files (main, scratchpad, contrib)
* Enabled and run unit tests
* Register manual and api with doc-base
Expand All @@ -311,13 +355,13 @@ libjakarta-poi-java (1.10.0-4) unstable; urgency=high
libjakarta-poi-java (1.10.0-3) unstable; urgency=low

* Missing comma in Build-Depends-Indep line of control file
(Closes: bug#254881)
(Closes: bug#254881)

-- Christian Bayle <[email protected]> Thu, 24 Jun 2004 22:33:36 +0200

libjakarta-poi-java (1.10.0-2) unstable; urgency=low

* Removed depends on doc package (Closes: #202399)
* Removed depends on doc package (Closes: #202399)

-- Christian Bayle <[email protected]> Tue, 22 Jul 2003 22:03:01 +0200

Expand Down
13 changes: 9 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Build-Depends:
default-jdk,
javahelper,
junit4,
libbcpkix-java (>= 1.54),
libbcpkix-java,
libcommons-codec-java,
libcommons-collections4-java,
libcommons-compress-java,
Expand All @@ -23,18 +23,21 @@ Build-Depends:
libdom4j-java,
libjaxb-java,
liblog4j1.2-java,
libxmlbeans-java (>= 3.0.2),
libxml-security-java (>= 2.0),
librhino-java (>= 1.7.7.2-3~),
libxmlbeans-java (>= 4.0.0),
libxml-security-java,
maven-repo-helper,
xmltooling-schemas
Standards-Version: 4.6.0
Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/libapache-poi-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libapache-poi-java
Homepage: https://poi.apache.org
Rules-Requires-Root: no

Package: libapache-poi-java
Architecture: all
Depends:
libbcpkix-java,
libcommons-codec-java,
libcommons-collections4-java,
libcommons-compress-java,
Expand All @@ -45,6 +48,7 @@ Depends:
libjaxb-java,
liblog4j1.2-java,
libxmlbeans-java,
libxml-security-java,
${misc:Depends}
Suggests: libapache-poi-java-doc, ant
Conflicts: libjakarta-poi-java
Expand Down Expand Up @@ -72,6 +76,7 @@ Suggests: libapache-poi-java
Conflicts: libjakarta-poi-java-doc
Replaces: libjakarta-poi-java-doc
Provides: libjakarta-poi-java-doc
Multi-Arch: foreign
Description: Apache POI - Java API for Microsoft Documents (Documentation)
Apache POI provides a Java API for manipulating various file formats based upon
the Office Open XML standards (OOXML) and Microsoft's OLE 2 Compound Document
Expand Down
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Copyright: 2003, Christian Bayle <[email protected]>
2012, tony mancill <[email protected]>
2013, Emmanuel Bourg <[email protected]>
License: Apache-2.0
X-Comment: It is assumed that package maintainers have licensed their work
Comment: It is assumed that package maintainers have licensed their work
under terms compatible with upstream licensing terms.

License: Apache-2.0
Expand Down
10 changes: 5 additions & 5 deletions debian/libapache-poi-java.classpath
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/usr/share/java/poi.jar commons-logging.jar log4-1.2.jar
/usr/share/java/poi-ooxml.jar poi.jar poi-ooxml-schemas.jar dom4j.jar
/usr/share/java/poi-ooxml-schemas.jar xmlbeans.jar
/usr/share/java/poi-scratchpad.jar poi.jar
/usr/share/java/poi-excelant.jar poi.jar poi-ooxml.jar ant.jar
usr/share/java/poi.jar /usr/share/java/commons-codec.jar /usr/share/java/commons-collections4.jar /usr/share/java/commons-logging.jar /usr/share/java/commons-math3.jar
usr/share/java/poi-ooxml.jar /usr/share/java/bcpkix.jar /usr/share/java/commons-collections4.jar /usr/share/java/commons-compress.jar /usr/share/java/curvesapi.jar /usr/share/java/poi.jar /usr/share/java/poi-ooxml-schemas.jar /usr/share/java/xmlbeans.jar /usr/share/java/xmlsec.jar
usr/share/java/poi-ooxml-schemas.jar /usr/share/java/xmlbeans.jar
usr/share/java/poi-scratchpad.jar /usr/share/java/poi.jar /usr/share/java/poi-ooxml.jar
usr/share/java/poi-excelant.jar /usr/share/java/poi.jar /usr/share/java/poi-ooxml.jar /usr/share/java/ant.jar
49 changes: 49 additions & 0 deletions debian/patches/13_rhino-script-engine.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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"/>
117 changes: 117 additions & 0 deletions debian/patches/14_language-level.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
Description: Preserves Java 8 compatibility when building with recent JDKs
Author: Emmanuel Bourg <[email protected]>
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">
Loading

0 comments on commit ebc8470

Please sign in to comment.