Update SmallRye Config to 3.2.0

quarkusio · Mar 13, 2023 · 99c581b · 99c581b
1 parent 1a5ed81
commit 99c581b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -54,8 +54,8 @@
         <microprofile-jwt.version>2.1</microprofile-jwt.version>
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1</microprofile-openapi.version>
-        <smallrye-common.version>2.0.0</smallrye-common.version>
-        <smallrye-config.version>3.1.3</smallrye-config.version>
+        <smallrye-common.version>2.1.0</smallrye-common.version>
+        <smallrye-config.version>3.1.4-SNAPSHOT</smallrye-config.version>
         <smallrye-health.version>4.0.1</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.3.0</smallrye-open-api.version>

diff --git a/core/runtime/src/test/java/io/quarkus/runtime/configuration/ConfigExpanderTestCase.java b/core/runtime/src/test/java/io/quarkus/runtime/configuration/ConfigExpanderTestCase.java
@@ -10,7 +10,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.smallrye.config.ExpressionConfigSourceInterceptor;
 import io.smallrye.config.PropertiesConfigSource;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.config.SmallRyeConfigBuilder;
@@ -20,11 +19,10 @@
 public class ConfigExpanderTestCase {
 
     private SmallRyeConfig buildConfig(Map<String, String> configMap) {
-        final SmallRyeConfigBuilder builder = new SmallRyeConfigBuilder();
-        builder.withInterceptors(new ExpressionConfigSourceInterceptor());
-        builder.withSources(new PropertiesConfigSource(configMap, "test input", 500));
-        final SmallRyeConfig config = (SmallRyeConfig) builder.build();
-        return config;
+        return new SmallRyeConfigBuilder()
+                .addDefaultInterceptors()
+                .withSources(new PropertiesConfigSource(configMap, "test input", 500))
+                .build();
     }
 
     private Map<String, String> maps(Map... maps) {

diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
@@ -70,7 +70,7 @@
         <slf4j-api.version>1.7.36</slf4j-api.version>
         <graal-sdk.version>22.3.0</graal-sdk.version>
         <plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
-        <smallrye-common.version>2.0.0</smallrye-common.version>
+        <smallrye-common.version>2.1.0</smallrye-common.version>
         <gradle-tooling.version>8.0.1</gradle-tooling.version>
         <quarkus-fs-util.version>0.0.9</quarkus-fs-util.version>
         <org-crac.version>0.1.3</org-crac.version>

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -61,7 +61,7 @@
         <version.surefire.plugin>3.0.0-M9</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <mutiny.version>2.1.0</mutiny.version>
-        <smallrye-common.version>1.13.2</smallrye-common.version>
+        <smallrye-common.version>2.1.0</smallrye-common.version>
         <vertx.version>4.3.8</vertx.version>
         <rest-assured.version>5.3.0</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>

diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
@@ -66,7 +66,7 @@
         <quarkus.version>999-SNAPSHOT</quarkus.version>
         <maven-model-helper.version>21</maven-model-helper.version>
         <commons-io.version>2.11.0</commons-io.version>
-        <smallrye-common.version>1.13.2</smallrye-common.version>
+        <smallrye-common.version>2.1.0</smallrye-common.version>
         <jandex.version>3.0.5</jandex.version>
     </properties>
     <modules>

diff --git a/...xtension/extension/deployment/src/test/java/io/quarkus/extest/UnknownBuildConfigTest.java b/...xtension/extension/deployment/src/test/java/io/quarkus/extest/UnknownBuildConfigTest.java
@@ -39,7 +39,7 @@ void unknownBuildConfig() {
                         .orElse(new Object[0]))
                 .collect(toSet());
 
-        assertEquals(7, logRecords.size());
+        assertEquals(7, unrecognized.size());
         assertTrue(unrecognized.contains("quarkus.unknown.prop"));
         assertTrue(unrecognized.contains("quarkus.build.unknown.prop"));
         assertTrue(unrecognized.contains("quarkus.rename-old.prop"));