From 09e7b9f2730ba9cf2801df9fadb62592f4037415 Mon Sep 17 00:00:00 2001 From: Tom Evans Date: Tue, 24 Oct 2023 12:29:06 +0100 Subject: [PATCH] Update MP Config 3.1 dependencies --- .../check_this_in_if_it_changes/pom.xml | 16 ++++++++-------- dev/cnf/oss_dependencies.maven | 16 ++++++++-------- .../io.openliberty.mpConfig-3.1.feature | 2 +- .../io.openliberty.mpReactiveStreams-3.0.feature | 2 +- .../.classpath | 0 .../.project | 2 +- .../.settings/bndtools.core.prefs | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../bnd.bnd | 14 +++++++------- dev/io.openliberty.io.smallrye.config3/bnd.bnd | 10 +++++----- .../bnd.bnd | 2 +- .../bnd.bnd | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/.classpath (100%) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/.project (90%) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/.settings/bndtools.core.prefs (100%) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/.settings/org.eclipse.core.resources.prefs (100%) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/.settings/org.eclipse.jdt.core.prefs (100%) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/.settings/org.eclipse.jdt.ui.prefs (100%) rename dev/{io.openliberty.io.smallrye.common.2.1 => io.openliberty.io.smallrye.common2}/bnd.bnd (65%) 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 51028a299493..af4d52021d80 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 @@ -919,7 +919,7 @@ io.smallrye.common smallrye-common-annotation - 2.1.0 + 2.2.0 io.smallrye.common @@ -929,7 +929,7 @@ io.smallrye.common smallrye-common-classloader - 2.1.0 + 2.2.0 io.smallrye.common @@ -939,7 +939,7 @@ io.smallrye.common smallrye-common-constraint - 2.1.0 + 2.2.0 io.smallrye.common @@ -949,7 +949,7 @@ io.smallrye.common smallrye-common-expression - 2.1.0 + 2.2.0 io.smallrye.common @@ -959,7 +959,7 @@ io.smallrye.common smallrye-common-function - 2.1.0 + 2.2.0 io.smallrye.config @@ -969,7 +969,7 @@ io.smallrye.config smallrye-config-common - 3.3.0 + 3.4.1 io.smallrye.config @@ -979,7 +979,7 @@ io.smallrye.config smallrye-config-core - 3.3.0 + 3.4.1 io.smallrye.config @@ -989,7 +989,7 @@ io.smallrye.config smallrye-config - 3.3.0 + 3.4.1 io.smallrye.reactive diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 966340dfe69d..d1baa34034e9 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -179,21 +179,21 @@ io.prometheus:simpleclient_tracer_otel_agent:0.15.0 io.reactivex.rxjava2:rxjava:2.2.19 io.reactivex:rxjava:1.3.8 io.smallrye.common:smallrye-common-annotation:1.6.0 -io.smallrye.common:smallrye-common-annotation:2.1.0 +io.smallrye.common:smallrye-common-annotation:2.2.0 io.smallrye.common:smallrye-common-classloader:1.6.0 -io.smallrye.common:smallrye-common-classloader:2.1.0 +io.smallrye.common:smallrye-common-classloader:2.2.0 io.smallrye.common:smallrye-common-constraint:1.6.0 -io.smallrye.common:smallrye-common-constraint:2.1.0 +io.smallrye.common:smallrye-common-constraint:2.2.0 io.smallrye.common:smallrye-common-expression:1.6.0 -io.smallrye.common:smallrye-common-expression:2.1.0 +io.smallrye.common:smallrye-common-expression:2.2.0 io.smallrye.common:smallrye-common-function:1.6.0 -io.smallrye.common:smallrye-common-function:2.1.0 +io.smallrye.common:smallrye-common-function:2.2.0 io.smallrye.config:smallrye-config-common:2.5.1 -io.smallrye.config:smallrye-config-common:3.3.0 +io.smallrye.config:smallrye-config-common:3.4.1 io.smallrye.config:smallrye-config-core:2.5.1 -io.smallrye.config:smallrye-config-core:3.3.0 +io.smallrye.config:smallrye-config-core:3.4.1 io.smallrye.config:smallrye-config:2.5.1 -io.smallrye.config:smallrye-config:3.3.0 +io.smallrye.config:smallrye-config:3.4.1 io.smallrye.reactive:mutiny-reactive-streams-operators-jakarta:2.2.0 io.smallrye.reactive:mutiny-zero-flow-adapters:1.0.0 io.smallrye.reactive:mutiny:2.2.0 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature index b41015dbc718..2c242e6f9e7a 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature @@ -17,7 +17,7 @@ Subsystem-Name: MicroProfile Config 3.1 com.ibm.websphere.appserver.internal.slf4j-1.7, \ io.openliberty.mpCompatible-6.1 -bundles=io.openliberty.io.smallrye.config3, \ - io.openliberty.io.smallrye.common.2.1, \ + io.openliberty.io.smallrye.common2, \ io.openliberty.microprofile.config.internal.common, \ io.openliberty.microprofile.config.internal.serverxml, \ com.ibm.ws.org.apache.commons.lang3, \ diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature index cfc5f227a901..54f8100567b8 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature @@ -19,7 +19,7 @@ IBM-API-Package: \ io.openliberty.microprofile.reactive.streams.operators30.internal, \ io.openliberty.io.smallrye.reactive.streams-operators-jakarta, \ io.openliberty.io.smallrye.reactive.mutiny,\ - io.openliberty.io.smallrye.common.2.1, \ + io.openliberty.io.smallrye.common2, \ io.openliberty.org.jboss.logging35 kind=beta edition=core diff --git a/dev/io.openliberty.io.smallrye.common.2.1/.classpath b/dev/io.openliberty.io.smallrye.common2/.classpath similarity index 100% rename from dev/io.openliberty.io.smallrye.common.2.1/.classpath rename to dev/io.openliberty.io.smallrye.common2/.classpath diff --git a/dev/io.openliberty.io.smallrye.common.2.1/.project b/dev/io.openliberty.io.smallrye.common2/.project similarity index 90% rename from dev/io.openliberty.io.smallrye.common.2.1/.project rename to dev/io.openliberty.io.smallrye.common2/.project index 824539b00eb2..40c436be092a 100644 --- a/dev/io.openliberty.io.smallrye.common.2.1/.project +++ b/dev/io.openliberty.io.smallrye.common2/.project @@ -1,6 +1,6 @@ - io.openliberty.io.smallrye.common.2.1 + io.openliberty.io.smallrye.common2 diff --git a/dev/io.openliberty.io.smallrye.common.2.1/.settings/bndtools.core.prefs b/dev/io.openliberty.io.smallrye.common2/.settings/bndtools.core.prefs similarity index 100% rename from dev/io.openliberty.io.smallrye.common.2.1/.settings/bndtools.core.prefs rename to dev/io.openliberty.io.smallrye.common2/.settings/bndtools.core.prefs diff --git a/dev/io.openliberty.io.smallrye.common.2.1/.settings/org.eclipse.core.resources.prefs b/dev/io.openliberty.io.smallrye.common2/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from dev/io.openliberty.io.smallrye.common.2.1/.settings/org.eclipse.core.resources.prefs rename to dev/io.openliberty.io.smallrye.common2/.settings/org.eclipse.core.resources.prefs diff --git a/dev/io.openliberty.io.smallrye.common.2.1/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.io.smallrye.common2/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from dev/io.openliberty.io.smallrye.common.2.1/.settings/org.eclipse.jdt.core.prefs rename to dev/io.openliberty.io.smallrye.common2/.settings/org.eclipse.jdt.core.prefs diff --git a/dev/io.openliberty.io.smallrye.common.2.1/.settings/org.eclipse.jdt.ui.prefs b/dev/io.openliberty.io.smallrye.common2/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from dev/io.openliberty.io.smallrye.common.2.1/.settings/org.eclipse.jdt.ui.prefs rename to dev/io.openliberty.io.smallrye.common2/.settings/org.eclipse.jdt.ui.prefs diff --git a/dev/io.openliberty.io.smallrye.common.2.1/bnd.bnd b/dev/io.openliberty.io.smallrye.common2/bnd.bnd similarity index 65% rename from dev/io.openliberty.io.smallrye.common.2.1/bnd.bnd rename to dev/io.openliberty.io.smallrye.common2/bnd.bnd index c6bf57be6a35..092cb8d5d28a 100644 --- a/dev/io.openliberty.io.smallrye.common.2.1/bnd.bnd +++ b/dev/io.openliberty.io.smallrye.common2/bnd.bnd @@ -16,17 +16,17 @@ javac.target: 11 Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))" -Bundle-SymbolicName: io.openliberty.io.smallrye.common.2.1; singleton:=true +Bundle-SymbolicName: io.openliberty.io.smallrye.common2; singleton:=true Export-Package: \ - io.smallrye.common.*; version="2.1.0" + io.smallrye.common.*; version="2.2.0" instrument.disabled: true -buildpath: \ - io.smallrye.common:smallrye-common-annotation;version=2.1.0;strategy=exact, \ - io.smallrye.common:smallrye-common-expression;version=2.1.0;strategy=exact, \ - io.smallrye.common:smallrye-common-constraint;version=2.1.0;strategy=exact, \ - io.smallrye.common:smallrye-common-function;version=2.1.0;strategy=exact, \ - io.smallrye.common:smallrye-common-classloader;version=2.1.0;strategy=exact + io.smallrye.common:smallrye-common-annotation;version=2.2.0;strategy=exact, \ + io.smallrye.common:smallrye-common-expression;version=2.2.0;strategy=exact, \ + io.smallrye.common:smallrye-common-constraint;version=2.2.0;strategy=exact, \ + io.smallrye.common:smallrye-common-function;version=2.2.0;strategy=exact, \ + io.smallrye.common:smallrye-common-classloader;version=2.2.0;strategy=exact diff --git a/dev/io.openliberty.io.smallrye.config3/bnd.bnd b/dev/io.openliberty.io.smallrye.config3/bnd.bnd index e559d9bbcf85..ae86fa2560a1 100644 --- a/dev/io.openliberty.io.smallrye.config3/bnd.bnd +++ b/dev/io.openliberty.io.smallrye.config3/bnd.bnd @@ -43,14 +43,14 @@ Include-Resource: \ Private-Package: io.openliberty.microprofile.config.internal.extension,io.openliberty.io.smallrye.config.resources.* Export-Package: \ - io.smallrye.config.*;version="3.3.0" + io.smallrye.config.*;version="3.4.1" -buildpath: \ - io.openliberty.io.smallrye.common.2.1;version=latest, \ - io.smallrye.config:smallrye-config;version=3.3.0;strategy=exact, \ - io.smallrye.config:smallrye-config-common;version=3.3.0;strategy=exact, \ - io.smallrye.config:smallrye-config-core;version=3.3.0;strategy=exact, \ + io.openliberty.io.smallrye.common2;version=latest, \ + io.smallrye.config:smallrye-config;version=3.4.1;strategy=exact, \ + io.smallrye.config:smallrye-config-common;version=3.4.1;strategy=exact, \ + io.smallrye.config:smallrye-config-core;version=3.4.1;strategy=exact, \ io.openliberty.jakarta.cdi.4.0;version=latest, \ io.openliberty.jakarta.annotation.2.1;version=latest, \ io.openliberty.org.eclipse.microprofile.config.3.1;version=latest, \ diff --git a/dev/io.openliberty.io.smallrye.reactive.messaging-api4/bnd.bnd b/dev/io.openliberty.io.smallrye.reactive.messaging-api4/bnd.bnd index 990800f12c92..55890e20a2a4 100644 --- a/dev/io.openliberty.io.smallrye.reactive.messaging-api4/bnd.bnd +++ b/dev/io.openliberty.io.smallrye.reactive.messaging-api4/bnd.bnd @@ -40,4 +40,4 @@ instrument.disabled: true -buildpath: \ io.smallrye.reactive:smallrye-reactive-messaging-api;version=4.8.0;strategy=exact,\ - io.openliberty.io.smallrye.common.2.1;version=latest + io.openliberty.io.smallrye.common2;version=latest diff --git a/dev/io.openliberty.io.smallrye.reactive.messaging-provider4/bnd.bnd b/dev/io.openliberty.io.smallrye.reactive.messaging-provider4/bnd.bnd index 74cc4c896bee..c01e46953bb8 100644 --- a/dev/io.openliberty.io.smallrye.reactive.messaging-provider4/bnd.bnd +++ b/dev/io.openliberty.io.smallrye.reactive.messaging-provider4/bnd.bnd @@ -60,6 +60,6 @@ Private-Package: \ com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\ com.ibm.ws.org.osgi.annotation.versioning;version=latest,\ io.openliberty.io.smallrye.reactive.mutiny;version=latest,\ - io.openliberty.io.smallrye.common.2.1;version=latest,\ + io.openliberty.io.smallrye.common2;version=latest,\ io.openliberty.io.smallrye.reactive.converter-api3;version=latest,\ io.openliberty.org.jboss.logging35;version=latest