Skip to content

Commit

Permalink
Issue #27775: Upgrade commons compress to 1.26
Browse files Browse the repository at this point in the history
  • Loading branch information
@hlhoots
hlhoots committed Feb 28, 2024
1 parent c0cc6af commit 813abbe
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 6 deletions.
2 changes: 1 addition & 1 deletion dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
View file
Expand Up @@ -1694,7 +1694,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.24.0</version>
<version>1.26.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dev/cnf/oss_dependencies.maven
View file
Expand Up @@ -334,7 +334,7 @@ org.apache.ant:ant-junit:1.10.10
org.apache.ant:ant:1.10.10
org.apache.bcel:bcel:6.6.1
org.apache.commons:commons-collections4:4.4
org.apache.commons:commons-compress:1.24.0
org.apache.commons:commons-compress:1.26.0
org.apache.commons:commons-dbcp2:2.7.0
org.apache.commons:commons-lang3:3.14.0
org.apache.commons:commons-math:2.2
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.filetransfer.routing.archiveExpander/bnd.bnd
View file
Expand Up @@ -53,4 +53,5 @@ instrument.disabled: true

-buildpath: \
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.ws.org.osgi.annotation.versioning;version=latest
3 changes: 2 additions & 1 deletion dev/com.ibm.ws.kernel.boot.archive/bnd.bnd
View file
Expand Up @@ -36,4 +36,5 @@ instrument.disabled: true
com.ibm.ws.logging.core;version=latest, \
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
com.ibm.ws.logging;version=latest, \
com.ibm.ws.org.apache.commons.compress;version=latest
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest
1 change: 1 addition & 0 deletions dev/com.ibm.ws.kernel.boot_fat/bnd.bnd
View file
Expand Up @@ -33,6 +33,7 @@ tested.features: mpconfig-1.3, concurrent-1.0, mpfaulttolerance-1.1, mpmetrics-1
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
org.jmock:jmock;strategy=exact;version=2.5.1, \
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.org.osgi.core;version=latest, \
com.ibm.websphere.org.osgi.service.cm;version=latest,\
com.ibm.websphere.org.osgi.service.component;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.kernel.feature_fat/bnd.bnd
View file
Expand Up @@ -61,6 +61,7 @@ tested.features: needsNewEe-1.0, newEe-1.0, \
org.jmock:jmock-junit4;strategy=exact;version=2.5.1,\
org.jmock:jmock;strategy=exact;version=2.5.1,\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.ws.org.apache.commons.compress,\
fattest.simplicity;version=latest,\
com.ibm.websphere.org.osgi.core;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.logging_fat/bnd.bnd
View file
Expand Up @@ -42,6 +42,7 @@ fat.project: true
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
org.jmock:jmock;strategy=exact;version=2.5.1, \
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.org.osgi.core;version=latest, \
com.ibm.websphere.org.osgi.service.cm;version=latest,\
com.ibm.websphere.org.osgi.service.component;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.microprofile.health.2.0_fat/bnd.bnd
View file
Expand Up @@ -27,6 +27,7 @@ tested.features=servlet-4.0,cdi-2.0,mphealth-3.0,mphealth-3.1,mpConfig-1.4,mpCon

-buildpath: \
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest, \
org.apache.johnzon:johnzon-core;version=1.1.0, \
com.ibm.websphere.javaee.jsonp.1.1;version=latest, \
com.ibm.websphere.javaee.cdi.1.2;version=latest, \
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.microprofile.health_fat/bnd.bnd
View file
Expand Up @@ -29,6 +29,7 @@ fat.project: true

-buildpath: \
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest, \
org.apache.johnzon:johnzon-core;version=1.1.0, \
com.ibm.websphere.javaee.jsonp.1.1;version=latest, \
com.ibm.websphere.javaee.cdi.1.2;version=latest, \
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.microprofile.metrics.2.x.monitor_fat/bnd.bnd
View file
Expand Up @@ -39,6 +39,7 @@ tested.features:\
org.jmock:jmock-junit4;strategy=exact;version=2.5.1,\
org.jmock:jmock;strategy=exact;version=2.5.1,\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.rest.handler;version=latest,\
com.ibm.websphere.javaee.servlet.3.1;version=latest,\
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.microprofile.metrics.monitor_fat/bnd.bnd
View file
Expand Up @@ -37,6 +37,7 @@ fat.project: true
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
org.jmock:jmock;strategy=exact;version=2.5.1, \
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.rest.handler;version=latest, \
com.ibm.websphere.javaee.servlet.3.1;version=latest, \
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/com.ibm.ws.microprofile.metrics_fat/bnd.bnd
View file
Expand Up @@ -36,6 +36,7 @@ fat.project: true
org.jmock:jmock-junit4;strategy=exact;version=2.5.1,\
org.jmock:jmock;strategy=exact;version=2.5.1,\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.rest.handler;version=latest,\
com.ibm.websphere.javaee.servlet.3.1;version=latest,\
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
Expand Down
4 changes: 2 additions & 2 deletions dev/com.ibm.ws.org.apache.commons.compress/bnd.bnd
View file
Expand Up @@ -10,8 +10,8 @@
# Contributors:
# IBM Corporation - initial API and implementation
#*******************************************************************************
-include= jar:${fileuri;${repo;org.apache.commons:commons-compress;1.24.0}}!/META-INF/MANIFEST.MF,bnd.overrides
-include= jar:${fileuri;${repo;org.apache.commons:commons-compress;1.26.0}}!/META-INF/MANIFEST.MF,bnd.overrides

publish.wlp.jar.disabled: true

-buildpath: org.apache.commons:commons-compress;version=1.24.0
-buildpath: org.apache.commons:commons-compress;version=1.26.0
2 changes: 1 addition & 1 deletion dev/com.ibm.ws.org.apache.commons.compress/bnd.overrides
View file
Expand Up @@ -4,4 +4,4 @@ bVersion=1.0
Bundle-SymbolicName: com.ibm.ws.org.apache.commons.compress

Include-Resource: \
@${repo;org.apache.commons:commons-compress;1.24.0}!/!META-INF/maven/*
@${repo;org.apache.commons:commons-compress;1.26.0}!/!META-INF/maven/*
1 change: 1 addition & 0 deletions dev/io.openliberty.microprofile.health.3.0.internal_fat/bnd.bnd
View file
Expand Up @@ -23,6 +23,7 @@ tested.features=servlet-4.0,cdi-2.0,mphealth-3.0,mpConfig-1.4,mpConfig-2.0

-buildpath: \
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest, \
org.apache.johnzon:johnzon-core;version=1.1.0, \
com.ibm.websphere.javaee.jsonp.1.1;version=latest, \
com.ibm.websphere.javaee.cdi.2.0;version=latest, \
Expand Down
1 change: 1 addition & 0 deletions dev/io.openliberty.microprofile.health.3.1.internal_fat/bnd.bnd
View file
Expand Up @@ -39,6 +39,7 @@ tested.features: \

-buildpath: \
com.ibm.ws.org.apache.commons.compress;version=latest, \
com.ibm.ws.org.apache.commons.io;version=latest, \
org.apache.johnzon:johnzon-core;version=1.1.0, \
com.ibm.websphere.javaee.jsonp.1.1;version=latest, \
com.ibm.websphere.javaee.cdi.2.0;version=latest, \
Expand Down
1 change: 1 addition & 0 deletions dev/io.openliberty.microprofile.metrics.internal.3.x.monitor_fat/bnd.bnd
View file
Expand Up @@ -41,6 +41,7 @@ tested.features:\
org.jmock:jmock-junit4;strategy=exact;version='2.5.1',\
org.jmock:jmock;strategy=exact;version='2.5.1',\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.rest.handler;version=latest,\
com.ibm.websphere.javaee.servlet.3.1;version=latest,\
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/io.openliberty.microprofile.metrics.internal.4.x.monitor_fat/bnd.bnd
View file
Expand Up @@ -45,6 +45,7 @@ tested.features:\
org.jmock:jmock-junit4;strategy=exact;version='2.5.1',\
org.jmock:jmock;strategy=exact;version='2.5.1',\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.rest.handler;version=latest,\
io.openliberty.jakarta.servlet.5.0;version=latest,\
io.openliberty.jakarta.cdi.3.0;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/io.openliberty.microprofile.metrics.internal.5.x.monitor_fat/bnd.bnd
View file
Expand Up @@ -49,6 +49,7 @@ tested.features:\
org.jmock:jmock-junit4;strategy=exact;version='2.5.1',\
org.jmock:jmock;strategy=exact;version='2.5.1',\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
com.ibm.websphere.rest.handler;version=latest,\
io.openliberty.jakarta.servlet.6.0;version=latest,\
io.openliberty.jakarta.cdi.4.0;version=latest,\
Expand Down
1 change: 1 addition & 0 deletions dev/io.openliberty.org.testcontainers/bnd.bnd
View file
Expand Up @@ -53,6 +53,7 @@ generate.replacement: true
com.github.docker-java:docker-java-transport;version=${dockerJavaVersion},\
com.github.docker-java:docker-java-transport-zerodep;version=${dockerJavaVersion},\
com.ibm.ws.org.apache.commons.compress;version=latest,\
com.ibm.ws.org.apache.commons.io;version=latest, \
org.testcontainers:testcontainers;version=${testContainerVersion},\
org.testcontainers:database-commons;version=${testContainerVersion},\
org.testcontainers:jdbc;version=${testContainerVersion},\
Expand Down

0 comments on commit 813abbe

Please sign in to comment.