From 96fb8131e25c2a56ead73b79e078165850f81344 Mon Sep 17 00:00:00 2001 From: "Harry L. Hoots, III" Date: Wed, 28 Feb 2024 09:41:07 -0500 Subject: [PATCH] Issue #27775: Upgrade commons compress to 1.26 --- .../dependabot/check_this_in_if_it_changes/pom.xml | 9 +++++++-- dev/cnf/oss_dependencies.maven | 5 +++-- .../bnd.bnd | 7 +++++-- dev/com.ibm.ws.filetransfer/bnd.bnd | 7 +++++-- dev/com.ibm.ws.kernel.boot.archive/bnd.bnd | 14 ++++++++++++-- dev/com.ibm.ws.kernel.boot_fat/bnd.bnd | 1 + dev/com.ibm.ws.kernel.feature_fat/bnd.bnd | 3 +-- dev/com.ibm.ws.kernel.feature_fat/build.gradle | 2 +- dev/com.ibm.ws.logging_fat/bnd.bnd | 1 + dev/com.ibm.ws.microprofile.health.2.0_fat/bnd.bnd | 1 + dev/com.ibm.ws.microprofile.health_fat/bnd.bnd | 1 + .../bnd.bnd | 1 + .../bnd.bnd | 1 + dev/com.ibm.ws.microprofile.metrics_fat/bnd.bnd | 1 + dev/com.ibm.ws.org.apache.commons.compress/bnd.bnd | 4 ++-- .../bnd.overrides | 2 +- dev/com.ibm.ws.org.apache.commons.io/bnd.bnd | 4 ++-- dev/com.ibm.ws.org.apache.commons.io/bnd.overrides | 14 +++++++------- .../bnd.bnd | 1 + .../bnd.bnd | 1 + .../bnd.bnd | 1 + .../bnd.bnd | 1 + .../bnd.bnd | 1 + .../bnd.bnd | 4 ++-- .../bnd.overrides | 4 ++-- dev/io.openliberty.org.testcontainers/bnd.bnd | 10 ++++++++-- 26 files changed, 70 insertions(+), 31 deletions(-) diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml index cdf3dcef8b32..2c9c318d9ead 100644 --- a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml +++ b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml @@ -394,7 +394,7 @@ commons-codec commons-codec - 1.15 + 1.16.1 commons-collections @@ -414,7 +414,7 @@ commons-io commons-io - 2.11.0 + 2.15.1 commons-lang @@ -1696,6 +1696,11 @@ commons-compress 1.24.0 + + org.apache.commons + commons-compress + 1.26.0 + org.apache.commons commons-dbcp2 diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index edb82271b6aa..d24c9d9821ef 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -74,11 +74,11 @@ com.sun.xml.ws:jaxws-tools:2.3.6 com.sun.xml.ws:jaxws-tools:3.0.2 com.unboundid:unboundid-ldapsdk:5.1.0 commons-cli:commons-cli:1.4 -commons-codec:commons-codec:1.15 +commons-codec:commons-codec:1.16.1 commons-collections:commons-collections:3.2.2 commons-digester:commons-digester:2.1 commons-fileupload:commons-fileupload:1.5 -commons-io:commons-io:2.11.0 +commons-io:commons-io:2.15.1 commons-lang:commons-lang:2.4 commons-logging:commons-logging:1.2 commons-net:commons-net:3.6 @@ -335,6 +335,7 @@ 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 diff --git a/dev/com.ibm.ws.filetransfer.routing.archiveExpander/bnd.bnd b/dev/com.ibm.ws.filetransfer.routing.archiveExpander/bnd.bnd index 1664af4bd0b9..a4bb39e73cc4 100644 --- a/dev/com.ibm.ws.filetransfer.routing.archiveExpander/bnd.bnd +++ b/dev/com.ibm.ws.filetransfer.routing.archiveExpander/bnd.bnd @@ -20,10 +20,12 @@ Bundle-Description: Archive Expander; version=${bVersion} Main-Class: com.ibm.ws.filetransfer.routing.archiveExpander.ArchiveExpander Export-Package: \ - com.ibm.ws.filetransfer.routing.archiveExpander + com.ibm.ws.filetransfer.routing.archiveExpander Private-Package: \ - org.apache.commons.compress.archivers.zip + org.apache.commons.compress.archivers.zip, \ + org.apache.commons.io.build, \ + org.apache.commons.io.file.attribute Import-Package: \ !org.apache.commons.compress.compressors.lzw, \ @@ -53,4 +55,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 diff --git a/dev/com.ibm.ws.filetransfer/bnd.bnd b/dev/com.ibm.ws.filetransfer/bnd.bnd index f5e9e4177af1..ea589f43d354 100644 --- a/dev/com.ibm.ws.filetransfer/bnd.bnd +++ b/dev/com.ibm.ws.filetransfer/bnd.bnd @@ -21,7 +21,9 @@ Export-Package:\ com.ibm.ws.filetransfer.util Private-Package: \ - com.ibm.ws.filetransfer.internal.* + com.ibm.ws.filetransfer.internal.*, \ + org.apache.commons.io.build, \ + org.apache.commons.io.file.attribute Include-Resource: \ OSGI-INF=resources/OSGI-INF @@ -49,4 +51,5 @@ instrument.classesExcludes: com/ibm/ws/filetransfer/internal/resources/*.class org.hamcrest:hamcrest-all;version=1.3, \ org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \ org.jmock:jmock;strategy=exact;version=2.5.1, \ - com.ibm.ws.kernel.boot;version=latest + com.ibm.ws.kernel.boot;version=latest, \ + com.ibm.ws.org.apache.commons.io;version=latest diff --git a/dev/com.ibm.ws.kernel.boot.archive/bnd.bnd b/dev/com.ibm.ws.kernel.boot.archive/bnd.bnd index cfa2fa8a1d8b..0ae33b7a7eab 100644 --- a/dev/com.ibm.ws.kernel.boot.archive/bnd.bnd +++ b/dev/com.ibm.ws.kernel.boot.archive/bnd.bnd @@ -24,7 +24,15 @@ Private-Package: \ org.apache.commons.compress.compressors.deflate64, \ org.apache.commons.compress.compressors, \ org.apache.commons.compress.compressors.lzw, \ - org.apache.commons.compress.utils + org.apache.commons.compress.utils, \ + org.apache.commons.codec, \ + org.apache.commons.io, \ + org.apache.commons.io.file.attribute, \ + org.apache.commons.io.input, \ + org.apache.commons.io.output, \ + org.apache.commons.io.function + + instrument.disabled: true @@ -36,4 +44,6 @@ 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,\ + io.openliberty.org.apache.commons.codec;version=latest diff --git a/dev/com.ibm.ws.kernel.boot_fat/bnd.bnd b/dev/com.ibm.ws.kernel.boot_fat/bnd.bnd index f33f9dcb2a4b..c737162da7c1 100644 --- a/dev/com.ibm.ws.kernel.boot_fat/bnd.bnd +++ b/dev/com.ibm.ws.kernel.boot_fat/bnd.bnd @@ -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,\ diff --git a/dev/com.ibm.ws.kernel.feature_fat/bnd.bnd b/dev/com.ibm.ws.kernel.feature_fat/bnd.bnd index e4a2439095c5..33ab0ca61c6c 100644 --- a/dev/com.ibm.ws.kernel.feature_fat/bnd.bnd +++ b/dev/com.ibm.ws.kernel.feature_fat/bnd.bnd @@ -60,8 +60,7 @@ tested.features: needsNewEe-1.0, newEe-1.0, \ org.hamcrest:hamcrest-all;version=1.3,\ 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.compress,\ + org.apache.commons:commons-compress;strategy=exact;version=1.24.0, \ fattest.simplicity;version=latest,\ com.ibm.websphere.org.osgi.core;version=latest,\ com.ibm.websphere.org.osgi.service.cm;version=latest,\ diff --git a/dev/com.ibm.ws.kernel.feature_fat/build.gradle b/dev/com.ibm.ws.kernel.feature_fat/build.gradle index 79107675ca0f..e0cc852db612 100644 --- a/dev/com.ibm.ws.kernel.feature_fat/build.gradle +++ b/dev/com.ibm.ws.kernel.feature_fat/build.gradle @@ -12,7 +12,7 @@ *******************************************************************************/ dependencies { - requiredLibs project(':com.ibm.ws.org.apache.commons.compress') + requiredLibs 'org.apache.commons:commons-compress:1.24.0' } task copyBundles { diff --git a/dev/com.ibm.ws.logging_fat/bnd.bnd b/dev/com.ibm.ws.logging_fat/bnd.bnd index 8b2fc81a47ad..2b8e39ecb3ce 100644 --- a/dev/com.ibm.ws.logging_fat/bnd.bnd +++ b/dev/com.ibm.ws.logging_fat/bnd.bnd @@ -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,\ diff --git a/dev/com.ibm.ws.microprofile.health.2.0_fat/bnd.bnd b/dev/com.ibm.ws.microprofile.health.2.0_fat/bnd.bnd index ccb4437c38ee..e2b3dfa579c4 100644 --- a/dev/com.ibm.ws.microprofile.health.2.0_fat/bnd.bnd +++ b/dev/com.ibm.ws.microprofile.health.2.0_fat/bnd.bnd @@ -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, \ diff --git a/dev/com.ibm.ws.microprofile.health_fat/bnd.bnd b/dev/com.ibm.ws.microprofile.health_fat/bnd.bnd index 76c5ee946375..0b1f65361600 100644 --- a/dev/com.ibm.ws.microprofile.health_fat/bnd.bnd +++ b/dev/com.ibm.ws.microprofile.health_fat/bnd.bnd @@ -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, \ diff --git a/dev/com.ibm.ws.microprofile.metrics.2.x.monitor_fat/bnd.bnd b/dev/com.ibm.ws.microprofile.metrics.2.x.monitor_fat/bnd.bnd index 49c790bc6378..b628fc287b3d 100644 --- a/dev/com.ibm.ws.microprofile.metrics.2.x.monitor_fat/bnd.bnd +++ b/dev/com.ibm.ws.microprofile.metrics.2.x.monitor_fat/bnd.bnd @@ -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,\ diff --git a/dev/com.ibm.ws.microprofile.metrics.monitor_fat/bnd.bnd b/dev/com.ibm.ws.microprofile.metrics.monitor_fat/bnd.bnd index d82a7b6359ac..cc82bada393e 100644 --- a/dev/com.ibm.ws.microprofile.metrics.monitor_fat/bnd.bnd +++ b/dev/com.ibm.ws.microprofile.metrics.monitor_fat/bnd.bnd @@ -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,\ diff --git a/dev/com.ibm.ws.microprofile.metrics_fat/bnd.bnd b/dev/com.ibm.ws.microprofile.metrics_fat/bnd.bnd index 53d358ba0807..3a562537f708 100644 --- a/dev/com.ibm.ws.microprofile.metrics_fat/bnd.bnd +++ b/dev/com.ibm.ws.microprofile.metrics_fat/bnd.bnd @@ -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,\ diff --git a/dev/com.ibm.ws.org.apache.commons.compress/bnd.bnd b/dev/com.ibm.ws.org.apache.commons.compress/bnd.bnd index 9152737c88bb..7e4e4ea8f4ed 100644 --- a/dev/com.ibm.ws.org.apache.commons.compress/bnd.bnd +++ b/dev/com.ibm.ws.org.apache.commons.compress/bnd.bnd @@ -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 diff --git a/dev/com.ibm.ws.org.apache.commons.compress/bnd.overrides b/dev/com.ibm.ws.org.apache.commons.compress/bnd.overrides index f8c89e65195b..a05ad223ce56 100644 --- a/dev/com.ibm.ws.org.apache.commons.compress/bnd.overrides +++ b/dev/com.ibm.ws.org.apache.commons.compress/bnd.overrides @@ -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/* \ No newline at end of file + @${repo;org.apache.commons:commons-compress;1.26.0}!/!META-INF/maven/* \ No newline at end of file diff --git a/dev/com.ibm.ws.org.apache.commons.io/bnd.bnd b/dev/com.ibm.ws.org.apache.commons.io/bnd.bnd index 8775095471c6..abac28f3ea8f 100644 --- a/dev/com.ibm.ws.org.apache.commons.io/bnd.bnd +++ b/dev/com.ibm.ws.org.apache.commons.io/bnd.bnd @@ -10,6 +10,6 @@ # Contributors: # IBM Corporation - initial API and implementation #******************************************************************************* --include= jar:${fileuri;${repo;commons-io:commons-io;2.11.0;EXACT}}!/META-INF/MANIFEST.MF,bnd.overrides +-include= jar:${fileuri;${repo;commons-io:commons-io;2.15.1;EXACT}}!/META-INF/MANIFEST.MF,bnd.overrides --buildpath: commons-io:commons-io;strategy=exact;version=2.11.0 +-buildpath: commons-io:commons-io;strategy=exact;version=2.15.1 diff --git a/dev/com.ibm.ws.org.apache.commons.io/bnd.overrides b/dev/com.ibm.ws.org.apache.commons.io/bnd.overrides index 98c6fdba812f..565116ff7af4 100644 --- a/dev/com.ibm.ws.org.apache.commons.io/bnd.overrides +++ b/dev/com.ibm.ws.org.apache.commons.io/bnd.overrides @@ -13,12 +13,12 @@ Import-Package: \ !org.apache.commons.io.*, * Export-Package: \ -org.apache.commons.io;version="2.11.0",org.apache.commons.io.comparator;version="2.11.0", \ -org.apache.commons.io.file;version="2.11.0",org.apache.commons.io.file.spi;version="2.11.0", \ -org.apache.commons.io.filefilter;version="2.11.0",org.apache.commons.io.function;version="2.11.0", \ -org.apache.commons.io.input;version="2.11.0",org.apache.commons.io.input.buffer;version="2.11.0", \ -org.apache.commons.io.monitor;version="2.11.0",org.apache.commons.io.output;version="2.11.0", \ -org.apache.commons.io.serialization;version="2.11.0" +org.apache.commons.io;version="2.15.1",org.apache.commons.io.comparator;version="2.15.1", \ +org.apache.commons.io.file;version="2.15.1",org.apache.commons.io.file.spi;version="2.15.1", \ +org.apache.commons.io.filefilter;version="2.15.1",org.apache.commons.io.function;version="2.15.1", \ +org.apache.commons.io.input;version="2.15.1",org.apache.commons.io.input.buffer;version="2.15.1", \ +org.apache.commons.io.monitor;version="2.15.1",org.apache.commons.io.output;version="2.15.1", \ +org.apache.commons.io.serialization;version="2.15.1" -Include-Resource: @${repo;commons-io:commons-io;2.11.0;EXACT}!/!META-INF/MANIFEST.MF|META-INF/maven/* +Include-Resource: @${repo;commons-io:commons-io;2.15.1;EXACT}!/!META-INF/MANIFEST.MF|META-INF/maven/* diff --git a/dev/io.openliberty.microprofile.health.3.0.internal_fat/bnd.bnd b/dev/io.openliberty.microprofile.health.3.0.internal_fat/bnd.bnd index e30819754682..db0e4f0ec58d 100644 --- a/dev/io.openliberty.microprofile.health.3.0.internal_fat/bnd.bnd +++ b/dev/io.openliberty.microprofile.health.3.0.internal_fat/bnd.bnd @@ -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, \ diff --git a/dev/io.openliberty.microprofile.health.3.1.internal_fat/bnd.bnd b/dev/io.openliberty.microprofile.health.3.1.internal_fat/bnd.bnd index ed5709e3bbb0..8aed8367dc12 100644 --- a/dev/io.openliberty.microprofile.health.3.1.internal_fat/bnd.bnd +++ b/dev/io.openliberty.microprofile.health.3.1.internal_fat/bnd.bnd @@ -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, \ diff --git a/dev/io.openliberty.microprofile.metrics.internal.3.x.monitor_fat/bnd.bnd b/dev/io.openliberty.microprofile.metrics.internal.3.x.monitor_fat/bnd.bnd index 7a6eb0986cd0..ddd58fa30bf1 100644 --- a/dev/io.openliberty.microprofile.metrics.internal.3.x.monitor_fat/bnd.bnd +++ b/dev/io.openliberty.microprofile.metrics.internal.3.x.monitor_fat/bnd.bnd @@ -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,\ diff --git a/dev/io.openliberty.microprofile.metrics.internal.4.x.monitor_fat/bnd.bnd b/dev/io.openliberty.microprofile.metrics.internal.4.x.monitor_fat/bnd.bnd index f541b5497a91..a6283b53d2db 100644 --- a/dev/io.openliberty.microprofile.metrics.internal.4.x.monitor_fat/bnd.bnd +++ b/dev/io.openliberty.microprofile.metrics.internal.4.x.monitor_fat/bnd.bnd @@ -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,\ diff --git a/dev/io.openliberty.microprofile.metrics.internal.5.x.monitor_fat/bnd.bnd b/dev/io.openliberty.microprofile.metrics.internal.5.x.monitor_fat/bnd.bnd index 305f78bca43e..a3dc6cd79daa 100644 --- a/dev/io.openliberty.microprofile.metrics.internal.5.x.monitor_fat/bnd.bnd +++ b/dev/io.openliberty.microprofile.metrics.internal.5.x.monitor_fat/bnd.bnd @@ -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,\ diff --git a/dev/io.openliberty.org.apache.commons.codec/bnd.bnd b/dev/io.openliberty.org.apache.commons.codec/bnd.bnd index 341311dcbb67..afe608b04ab3 100644 --- a/dev/io.openliberty.org.apache.commons.codec/bnd.bnd +++ b/dev/io.openliberty.org.apache.commons.codec/bnd.bnd @@ -10,6 +10,6 @@ # Contributors: # IBM Corporation - initial API and implementation #******************************************************************************* --include= jar:${fileuri;${repo;commons-codec:commons-codec;1.15}}!/META-INF/MANIFEST.MF,bnd.overrides +-include= jar:${fileuri;${repo;commons-codec:commons-codec;1.16.1}}!/META-INF/MANIFEST.MF,bnd.overrides --buildpath: commons-codec:commons-codec;version=1.15 +-buildpath: commons-codec:commons-codec;version=1.16.1 diff --git a/dev/io.openliberty.org.apache.commons.codec/bnd.overrides b/dev/io.openliberty.org.apache.commons.codec/bnd.overrides index da54a1b86103..d643f96c06d4 100644 --- a/dev/io.openliberty.org.apache.commons.codec/bnd.overrides +++ b/dev/io.openliberty.org.apache.commons.codec/bnd.overrides @@ -1,7 +1,7 @@ -include= ~../cnf/resources/bnd/rejar.props -bVersion=1.15 +bVersion=1.16 Bundle-SymbolicName: io.openliberty.org.apache.commons.codec Include-Resource: \ - @${repo;commons-codec:commons-codec;1.15;EXACT}!/!META-INF/maven/* \ No newline at end of file + @${repo;commons-codec:commons-codec;1.16.1;EXACT}!/!META-INF/maven/* \ No newline at end of file diff --git a/dev/io.openliberty.org.testcontainers/bnd.bnd b/dev/io.openliberty.org.testcontainers/bnd.bnd index 1998202a77a3..fb5194fe46f0 100644 --- a/dev/io.openliberty.org.testcontainers/bnd.bnd +++ b/dev/io.openliberty.org.testcontainers/bnd.bnd @@ -27,9 +27,13 @@ Bundle-Description: FAT Testcontainer Bundle; version=${bVersion} Export-Package: \ com.github.*;version="${dockerJavaVersion}",\ com.sun.jna.*;version="5.8.0",\ - org.apache.commons.*;version="1.24.0",\ + org.apache.commons.codec.*;version="1.16.1",\ + org.apache.commons.compress.*;version="1.26.0",\ + org.apache.commons.io.*;version="2.15.1",\ org.testcontainers.*;version="${testContainerVersion}";-split-package:=merge-last,\ - org.rnorth.*;version="1.0.8" + org.rnorth.*;version="1.0.8",\ + + #Ensure that /META-INF/service folder from testcontainers core project is included in bundle. # This will ensure that the other docker container strategies are accessible at runtime. @@ -53,6 +57,8 @@ 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, \ + io.openliberty.org.apache.commons.codec;version=latest, \ org.testcontainers:testcontainers;version=${testContainerVersion},\ org.testcontainers:database-commons;version=${testContainerVersion},\ org.testcontainers:jdbc;version=${testContainerVersion},\