Introduce new configuration framework and update SmallRye Config version

bom/runtime/pom.xml

@@ -31,7 +31,7 @@
         <microprofile-opentracing-api.version>1.3.1</microprofile-opentracing-api.version>
         <microprofile-reactive-streams-operators.version>1.0</microprofile-reactive-streams-operators.version>
         <microprofile-rest-client.version>1.3.4</microprofile-rest-client.version>
-        <smallrye-config.version>1.3.9</smallrye-config.version>
+        <smallrye-config.version>1.4.1</smallrye-config.version>
         <smallrye-health.version>2.1.0</smallrye-health.version>
         <smallrye-metrics.version>2.3.1</smallrye-metrics.version>
         <smallrye-open-api.version>1.1.20</smallrye-open-api.version>
@@ -1083,6 +1083,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-config-common</artifactId>
+                <version>${smallrye-config.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-health</artifactId>

core/creator/src/main/java/io/quarkus/creator/phase/augment/AugmentTask.java

@@ -15,7 +15,9 @@
 import java.util.Properties;
 import java.util.function.Consumer;
 
+import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.spi.ConfigBuilder;
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.BootstrapDependencyProcessingException;
@@ -36,8 +38,11 @@
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
+import io.quarkus.runtime.configuration.ConfigUtils;
+import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 import io.smallrye.config.PropertiesConfigSource;
-import io.smallrye.config.SmallRyeConfigProviderResolver;
+import io.smallrye.config.SmallRyeConfig;
+import io.smallrye.config.SmallRyeConfigBuilder;
 
 /**
  * This phase consumes {@link CurateOutcome} and processes
@@ -110,32 +115,25 @@ public AugmentOutcome run(CurateOutcome appState, CuratedApplicationCreator ctx)
         }
         //first lets look for some config, as it is not on the current class path
         //and we need to load it to run the build process
-        Path config = configDir.resolve("application.properties");
-        if (Files.exists(config)) {
+        Path configPath = configDir.resolve("application.properties");
+        SmallRyeConfigBuilder configBuilder = ConfigUtils.configBuilder(false);
+        if (Files.exists(configPath)) {
             try {
-                ConfigBuilder builder = SmallRyeConfigProviderResolver.instance().getBuilder()
-                        .addDefaultSources()
-                        .addDiscoveredConverters()
-                        .addDiscoveredSources()
-                        .withSources(new PropertiesConfigSource(config.toUri().toURL()));
-
-                if (configCustomizer != null) {
-                    configCustomizer.accept(builder);
-                }
-                SmallRyeConfigProviderResolver.instance().registerConfig(builder.build(),
-                        Thread.currentThread().getContextClassLoader());
-            } catch (Exception e) {
-                throw new RuntimeException(e);
+                configBuilder.withSources(new PropertiesConfigSource(configPath.toUri().toURL()));
+            } catch (IOException e) {
+                throw new IllegalArgumentException("Failed to convert config URL", e);
             }
-        } else if (configCustomizer != null) {
-            ConfigBuilder builder = SmallRyeConfigProviderResolver.instance().getBuilder()
-                    .addDefaultSources()
-                    .addDiscoveredConverters()
-                    .addDiscoveredSources();
-
-            configCustomizer.accept(builder);
-            SmallRyeConfigProviderResolver.instance().registerConfig(builder.build(),
-                    Thread.currentThread().getContextClassLoader());
+        }
+        if (configCustomizer != null) {
+            configCustomizer.accept(configBuilder);
+        }
+        final SmallRyeConfig config = configBuilder.build();
+        QuarkusConfigFactory.setConfig(config);
+        final ConfigProviderResolver cpr = ConfigProviderResolver.instance();
+        final Config existing = cpr.getConfig();
+        if (existing != config) {
+            cpr.releaseConfig(existing);
+            // subsequent calls will get the new config
         }
 
         final AppModelResolver depResolver = appState.getArtifactResolver();

core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigTask.java

@@ -16,6 +16,7 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.BootstrapDependencyProcessingException;
@@ -40,8 +41,11 @@
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.util.FileUtil;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.ConfigUtils;
+import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 import io.smallrye.config.PropertiesConfigSource;
-import io.smallrye.config.SmallRyeConfigProviderResolver;
+import io.smallrye.config.SmallRyeConfig;
+import io.smallrye.config.SmallRyeConfigBuilder;
 
 /**
  * This phase generates an example configuration file
@@ -65,12 +69,16 @@ public Path run(CurateOutcome appState, CuratedApplicationCreator creator) throw
         //TODO: do we actually need to load this config? Does it affect resolution?
         if (Files.exists(configFile)) {
             try {
-                Config built = SmallRyeConfigProviderResolver.instance().getBuilder()
-                        .addDefaultSources()
-                        .addDiscoveredConverters()
-                        .addDiscoveredSources()
-                        .withSources(new PropertiesConfigSource(configFile.toUri().toURL())).build();
-                SmallRyeConfigProviderResolver.instance().registerConfig(built, Thread.currentThread().getContextClassLoader());
+                SmallRyeConfigBuilder builder = ConfigUtils.configBuilder(false)
+                        .withSources(new PropertiesConfigSource(configFile.toUri().toURL()));
+                final SmallRyeConfig config = builder.build();
+                QuarkusConfigFactory.setConfig(config);
+                final ConfigProviderResolver cpr = ConfigProviderResolver.instance();
+                final Config existing = cpr.getConfig();
+                if (existing != config) {
+                    cpr.releaseConfig(existing);
+                    // subsequent calls will get the new config
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

core/deployment/src/main/java/io/quarkus/deployment/ApplicationConfig.java

@@ -1,5 +1,7 @@
 package io.quarkus.deployment;
 
+import java.util.Optional;
+
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -12,12 +14,12 @@ public class ApplicationConfig {
      * If not set, defaults to the name of the project.
      */
     @ConfigItem
-    public String name;
+    public Optional<String> name;
 
     /**
      * The version of the application.
      * If not set, defaults to the version of the project
      */
     @ConfigItem
-    public String version;
+    public Optional<String> version;
 }