Skip to content

Commit

Permalink
POI 5.2.5 update xlc java and its dependencies (#202)
Browse files Browse the repository at this point in the history
* update xlc java and its dependencies

* NEWS, check against bot branch

* Revert xlconnect Java ref before merging
  • Loading branch information
spoltier authored Dec 13, 2023
1 parent 70f0f45 commit 17dd25e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
with:
repository: miraisolutions/xlconnect-java
# specify the below if you are working on a parallel xlconnect-java branch
# ref: feature/...
# ref: feature/...

- name: retrieve POM dependencies using maven
if: success() && matrix.config.r-version == 'release' && matrix.config.os-name == 'ubuntu'
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ XLConnect News
--------------
1.0.8 tbd
* avoid log4j2 error on first use (#172)
* update POI to 5.2.4
* update POI to 5.2.5

1.0.7 2023-01-19
* Fix issue with loadWorkbook (#181)
Expand Down
26 changes: 13 additions & 13 deletions R/onLoad.R
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,19 @@
sharedPaths <- tryCatch({
c(
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/poi/poi-ooxml-full/5.2.4/poi-ooxml-full-5.2.4.jar"), "poi-ooxml-full.jar",
"5.2.4", libname, pkgname),
paste0(apachePrefix, "/poi/poi-ooxml-full/5.2.5/poi-ooxml-full-5.2.5.jar"), "poi-ooxml-full.jar",
"5.2.5", libname, pkgname),
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/poi/poi-ooxml/5.2.4/poi-ooxml-5.2.4.jar"), "poi-ooxml.jar",
"5.2.4", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
paste0(apachePrefix, "/poi/poi-ooxml/5.2.5/poi-ooxml-5.2.5.jar"), "poi-ooxml.jar",
"5.2.5", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/poi/poi/5.2.4/poi-5.2.4.jar"), "poi.jar",
"5.2.4", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
paste0(apachePrefix, "/poi/poi/5.2.5/poi-5.2.5.jar"), "poi.jar",
"5.2.5", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/commons/commons-compress/1.24.0/commons-compress-1.24.0.jar"), "commons-compress.jar",
"1\\.(1[8-9]|[2-9][0-9]).*", libname, pkgname, debianpkg = "libcommons-compress-java", rpmpkg="apache-commons-compress"),
paste0(apachePrefix, "/commons/commons-compress/1.25.0/commons-compress-1.25.0.jar"), "commons-compress.jar",
"1\\.(2[5-9]|[2-9][0-9]).*", libname, pkgname, debianpkg = "libcommons-compress-java", rpmpkg="apache-commons-compress"),
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/xmlbeans/xmlbeans/5.1.1/xmlbeans-5.1.1.jar"), "xmlbeans.jar",
paste0(apachePrefix, "/xmlbeans/xmlbeans/5.2.0/xmlbeans-5.2.0.jar"), "xmlbeans.jar",
"5\\..*", libname, pkgname, debianpkg="libxmlbeans-java"),
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/commons/commons-collections4/4.4/commons-collections4-4.4.jar"), "commons-collections4.jar",
Expand All @@ -79,14 +79,14 @@
paste0(apachePrefix, "/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar"), "commons-math3.jar",
"3\\.([6-9]|1[0-9]).*", libname, pkgname, debianpkg="libcommons-math3-java"),
xlcEnsureDependenciesFor(
paste0(apachePrefix, "/logging/log4j/log4j-api/2.20.0/log4j-api-2.20.0.jar"), "log4j-api.jar",
"2.17.2", libname, pkgname),
paste0(apachePrefix, "/logging/log4j/log4j-api/2.21.1/log4j-api-2.21.1.jar"), "log4j-api.jar",
"2.21.1", libname, pkgname),
xlcEnsureDependenciesFor(
paste0(repo, "/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar"), "commons-codec-1.16.0.jar",
"1\\.(1[1-9]|[2-9][0-9]).*", libname, pkgname, debianpkg="libcommons-codec-java", rpmpkg="apache-commons-codec"),
xlcEnsureDependenciesFor(
paste0(repo, "/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar"), "commons-io-2.13.0.jar",
"2\\.(1[1-9]|[2-9][0-9]).*", libname, pkgname, debianpkg="libcommons-io-java", rpmpkg="apache-commons-io"),
paste0(repo, "/commons-io/commons-io/2.15.0/commons-io-2.15.0.jar"), "commons-io-2.15.0.jar",
"2\\.(1[5-9]|[2-9][0-9]).*", libname, pkgname, debianpkg="libcommons-io-java", rpmpkg="apache-commons-io"),
xlcEnsureDependenciesFor(
paste0(repo, "/com/zaxxer/SparseBitSet/1.3/SparseBitSet-1.3.jar"), "SparseBitSet.jar",
"1\\.([2-9]|[1-9][0-9]).*", libname, pkgname)
Expand Down
Binary file modified inst/java/XLConnect-1.0.8-SNAPSHOT.jar
Binary file not shown.

0 comments on commit 17dd25e

Please sign in to comment.