Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#217 Upgrade commons-compress to version 1.26.1 and upgrade related d… #218

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: XLConnect
Type: Package
Title: Excel Connector for R
Version: 1.0.8
Version: 1.0.8.9999
Authors@R: c(person("Mirai Solutions GmbH", role = "aut",
email = "[email protected]"),
person("Martin", "Studer", role = "cre",
6 changes: 3 additions & 3 deletions R/onLoad.R
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@
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.25.0/commons-compress-1.25.0.jar"), "commons-compress.jar",
paste0(apachePrefix, "/commons/commons-compress/1.26.1/commons-compress-1.26.1.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.2.0/xmlbeans-5.2.0.jar"), "xmlbeans.jar",
@@ -82,10 +82,10 @@
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",
paste0(repo, "/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar"), "commons-codec-1.16.1.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.15.0/commons-io-2.15.0.jar"), "commons-io-2.15.0.jar",
paste0(repo, "/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar"), "commons-io-2.15.1.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",