Update MP Config 3.1 dependencies

OpenLiberty · Oct 24, 2023 · 09e7b9f · 09e7b9f
1 parent bdb6b65
commit 09e7b9f
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 33 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
@@ -919,7 +919,7 @@
     <dependency>
       <groupId>io.smallrye.common</groupId>
       <artifactId>smallrye-common-annotation</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.common</groupId>
@@ -929,7 +929,7 @@
     <dependency>
       <groupId>io.smallrye.common</groupId>
       <artifactId>smallrye-common-classloader</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.common</groupId>
@@ -939,7 +939,7 @@
     <dependency>
       <groupId>io.smallrye.common</groupId>
       <artifactId>smallrye-common-constraint</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.common</groupId>
@@ -949,7 +949,7 @@
     <dependency>
       <groupId>io.smallrye.common</groupId>
       <artifactId>smallrye-common-expression</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.common</groupId>
@@ -959,7 +959,7 @@
     <dependency>
       <groupId>io.smallrye.common</groupId>
       <artifactId>smallrye-common-function</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.config</groupId>
@@ -969,7 +969,7 @@
     <dependency>
       <groupId>io.smallrye.config</groupId>
       <artifactId>smallrye-config-common</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.config</groupId>
@@ -979,7 +979,7 @@
     <dependency>
       <groupId>io.smallrye.config</groupId>
       <artifactId>smallrye-config-core</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.config</groupId>
@@ -989,7 +989,7 @@
     <dependency>
       <groupId>io.smallrye.config</groupId>
       <artifactId>smallrye-config</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye.reactive</groupId>

diff --git 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/...ere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature b/...ere.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/...ures/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature b/...ures/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/...liberty.io.smallrye.common.2.1/.classpath → ...penliberty.io.smallrye.common2/.classpath b/...liberty.io.smallrye.common.2.1/.classpath → ...penliberty.io.smallrye.common2/.classpath
diff --git a/...enliberty.io.smallrye.common.2.1/.project → ....openliberty.io.smallrye.common2/.project b/...enliberty.io.smallrye.common.2.1/.project → ....openliberty.io.smallrye.common2/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>io.openliberty.io.smallrye.common.2.1</name>
+	<name>io.openliberty.io.smallrye.common2</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/....common.2.1/.settings/bndtools.core.prefs → ...rye.common2/.settings/bndtools.core.prefs b/....common.2.1/.settings/bndtools.core.prefs → ...rye.common2/.settings/bndtools.core.prefs
diff --git a/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs
diff --git a/....2.1/.settings/org.eclipse.jdt.core.prefs → ...mon2/.settings/org.eclipse.jdt.core.prefs b/....2.1/.settings/org.eclipse.jdt.core.prefs → ...mon2/.settings/org.eclipse.jdt.core.prefs
diff --git a/...on.2.1/.settings/org.eclipse.jdt.ui.prefs → ...ommon2/.settings/org.eclipse.jdt.ui.prefs b/...on.2.1/.settings/org.eclipse.jdt.ui.prefs → ...ommon2/.settings/org.eclipse.jdt.ui.prefs
diff --git a/...penliberty.io.smallrye.common.2.1/bnd.bnd → ...o.openliberty.io.smallrye.common2/bnd.bnd b/...penliberty.io.smallrye.common.2.1/bnd.bnd → ...o.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
@@ -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
@@ -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
@@ -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