Merge pull request #39678 from gsmet/3.9.1-backports-1

3.9.1 backports 1

.github/dependabot.yml

@@ -181,6 +181,7 @@ updates:
       - dependency-name: org.apache.groovy:*
       - dependency-name: org.apache.qpid:*
       - dependency-name: biz.paluch.logging:logstash-gelf
+      - dependency-name: org.bitbucket.b_c:jose4j
     ignore:
       # this one cannot be upgraded due to the usage of proxies in new versions
       # the proxy implements interfaces in a random order which causes issues

.mvn/extensions.xml

@@ -17,6 +17,6 @@
     <extension>
         <groupId>io.quarkus.develocity</groupId>
         <artifactId>quarkus-project-develocity-extension</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </extension>
 </extensions>

bom/application/pom.xml

@@ -57,12 +57,12 @@
         <smallrye-open-api.version>3.10.0</smallrye-open-api.version>
         <smallrye-graphql.version>2.8.1</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.2.6</smallrye-fault-tolerance.version>
-        <smallrye-jwt.version>4.4.0</smallrye-jwt.version>
+        <smallrye-jwt.version>4.5.0</smallrye-jwt.version>
         <smallrye-context-propagation.version>2.1.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>3.0.1</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>3.11.0</smallrye-mutiny-vertx-binding.version>
-        <smallrye-reactive-messaging.version>4.18.0</smallrye-reactive-messaging.version>
+        <smallrye-reactive-messaging.version>4.19.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>2.6.0</smallrye-stork.version>
         <jakarta.activation.version>2.1.3</jakarta.activation.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
@@ -219,6 +219,7 @@
         <!-- these two artifacts needs to be compatible together -->
         <strimzi-oauth.version>0.14.0</strimzi-oauth.version>
         <strimzi-oauth.nimbus.version>9.37.3</strimzi-oauth.nimbus.version>
+        <jose4j.version>0.9.6</jose4j.version>
         <java-buildpack-client.version>0.0.6</java-buildpack-client.version>
         <org-crac.version>0.1.3</org-crac.version>
         <sshd-common.version>2.12.0</sshd-common.version>
@@ -4239,6 +4240,11 @@
                 <artifactId>nimbus-jose-jwt</artifactId>
                 <version>${strimzi-oauth.nimbus.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.bitbucket.b_c</groupId>
+                <artifactId>jose4j</artifactId>
+                <version>${jose4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-toolchain</artifactId>

core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java

@@ -9,6 +9,8 @@
 import static io.quarkus.runtime.configuration.PropertiesUtil.filterPropertiesInRoots;
 import static io.smallrye.config.ConfigMappings.ConfigClassWithPrefix.configClassWithPrefix;
 import static io.smallrye.config.Expressions.withoutExpansion;
+import static io.smallrye.config.PropertiesConfigSourceProvider.classPathSources;
+import static io.smallrye.config.SmallRyeConfigBuilder.META_INF_MICROPROFILE_CONFIG_PROPERTIES;
 import static java.util.stream.Collectors.toSet;
 
 import java.io.IOException;
@@ -78,6 +80,7 @@
 import io.smallrye.config.EnvConfigSource;
 import io.smallrye.config.KeyMap;
 import io.smallrye.config.KeyMapBackedConfigSource;
+import io.smallrye.config.ProfileConfigSourceInterceptor;
 import io.smallrye.config.PropertiesConfigSource;
 import io.smallrye.config.SecretKeys;
 import io.smallrye.config.SmallRyeConfig;
@@ -511,10 +514,12 @@ ReadResult run() {
                 nameBuilder.setLength(0);
             }
 
+            SmallRyeConfig runtimeConfig = getConfigForRuntimeRecording();
+
             // Register defaults for Roots
-            allBuildTimeValues.putAll(getDefaults(buildTimePatternMap));
-            buildTimeRunTimeValues.putAll(getDefaults(buildTimeRunTimePatternMap));
-            runTimeDefaultValues.putAll(getDefaults(runTimePatternMap));
+            allBuildTimeValues.putAll(getDefaults(config, buildTimePatternMap));
+            buildTimeRunTimeValues.putAll(getDefaults(config, buildTimeRunTimePatternMap));
+            runTimeDefaultValues.putAll(getDefaults(runtimeConfig, runTimePatternMap));
 
             // Register defaults for Mappings
             // Runtime defaults are added in ConfigGenerationBuildStep.generateBuilders to include user mappings
@@ -601,7 +606,7 @@ ReadResult run() {
                     knownProperty = knownProperty || matched != null;
                     if (matched != null) {
                         // it's a run-time default (record for later)
-                        ConfigValue configValue = withoutExpansion(() -> config.getConfigValue(propertyName));
+                        ConfigValue configValue = withoutExpansion(() -> runtimeConfig.getConfigValue(propertyName));
                         if (configValue.getValue() != null) {
                             runTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
                         }
@@ -612,7 +617,7 @@ ReadResult run() {
                     }
                 } else {
                     // it's not managed by us; record it
-                    ConfigValue configValue = withoutExpansion(() -> config.getConfigValue(propertyName));
+                    ConfigValue configValue = withoutExpansion(() -> runtimeConfig.getConfigValue(propertyName));
                     if (configValue.getValue() != null) {
                         runTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
                     }
@@ -639,8 +644,8 @@ ReadResult run() {
                 for (String property : mappedProperties) {
                     unknownBuildProperties.remove(property);
                     ConfigValue value = config.getConfigValue(property);
-                    if (value != null && value.getRawValue() != null) {
-                        allBuildTimeValues.put(property, value.getRawValue());
+                    if (value.getRawValue() != null) {
+                        allBuildTimeValues.put(value.getNameProfiled(), value.getRawValue());
                     }
                 }
             }
@@ -651,9 +656,9 @@ ReadResult run() {
                 for (String property : mappedProperties) {
                     unknownBuildProperties.remove(property);
                     ConfigValue value = config.getConfigValue(property);
-                    if (value != null && value.getRawValue() != null) {
-                        allBuildTimeValues.put(property, value.getRawValue());
-                        buildTimeRunTimeValues.put(property, value.getRawValue());
+                    if (value.getRawValue() != null) {
+                        allBuildTimeValues.put(value.getNameProfiled(), value.getRawValue());
+                        buildTimeRunTimeValues.put(value.getNameProfiled(), value.getRawValue());
                     }
                 }
             }
@@ -663,9 +668,9 @@ ReadResult run() {
                 Set<String> mappedProperties = ConfigMappings.mappedProperties(mapping, allProperties);
                 for (String property : mappedProperties) {
                     unknownBuildProperties.remove(property);
-                    ConfigValue value = config.getConfigValue(property);
-                    if (value != null && value.getRawValue() != null) {
-                        runTimeValues.put(property, value.getRawValue());
+                    ConfigValue value = runtimeConfig.getConfigValue(property);
+                    if (value.getRawValue() != null) {
+                        runTimeValues.put(value.getNameProfiled(), value.getRawValue());
                     }
                 }
             }
@@ -1073,8 +1078,7 @@ public String getValue(final String propertyName) {
 
             Set<String> properties = new HashSet<>();
 
-            // We build a new Config to also apply the interceptor chain, this includes the active profile. A property
-            // may only exist in its profiled name format, but it requires recording in the unprofiled name
+            // We build a new Config to also apply the interceptor chain to generate any additional properties.
             SmallRyeConfigBuilder builder = ConfigUtils.emptyConfigBuilder();
             builder.getSources().clear();
             builder.getSourceProviders().clear();
@@ -1108,13 +1112,50 @@ public Set<String> getPropertyNames() {
                             return Collections.emptySet();
                         }
                     });
+
+            String[] profiles = config.getProfiles().toArray(String[]::new);
             for (String property : builder.build().getPropertyNames()) {
-                properties.add(property);
+                properties.add(ProfileConfigSourceInterceptor.activeName(property, profiles));
             }
 
             return properties;
         }
 
+        /**
+         * Use this Config instance to record the runtime default values. We cannot use the main Config
+         * instance because it may record values coming from local development sources (Environment Variables,
+         * System Properties, etc.) in at build time. Local config source values may be completely different between the
+         * build environment and the runtime environment, so it doesn't make sense to record these.
+         *
+         * @return a new {@link SmallRyeConfig} instance without the local sources, including SysPropConfigSource,
+         *         EnvConfigSource, .env, and Build system sources.
+         */
+        private SmallRyeConfig getConfigForRuntimeRecording() {
+            SmallRyeConfigBuilder builder = ConfigUtils.emptyConfigBuilder();
+            builder.getSources().clear();
+            builder.getSourceProviders().clear();
+            builder.setAddDefaultSources(false)
+                    // Customizers may duplicate sources, but not much we can do about it, we need to run them
+                    .addDiscoveredCustomizers()
+                    // Read microprofile-config.properties, because we disabled the default sources
+                    .withSources(classPathSources(META_INF_MICROPROFILE_CONFIG_PROPERTIES, classLoader));
+
+            // TODO - Should we reset quarkus.config.location to not record from these sources?
+            for (ConfigSource configSource : config.getConfigSources()) {
+                if (configSource instanceof SysPropConfigSource) {
+                    continue;
+                }
+                if (configSource instanceof EnvConfigSource) {
+                    continue;
+                }
+                if ("PropertiesConfigSource[source=Build system]".equals(configSource.getName())) {
+                    continue;
+                }
+                builder.withSources(configSource);
+            }
+            return builder.build();
+        }
+
         private Map<String, String> filterActiveProfileProperties(final Map<String, String> properties) {
             Set<String> propertiesToRemove = new HashSet<>();
             for (String property : properties.keySet()) {
@@ -1129,13 +1170,15 @@ private Map<String, String> filterActiveProfileProperties(final Map<String, Stri
             return properties;
         }
 
-        private Map<String, String> getDefaults(final ConfigPatternMap<Container> patternMap) {
+        private static Map<String, String> getDefaults(final SmallRyeConfig config,
+                final ConfigPatternMap<Container> patternMap) {
             Map<String, String> defaultValues = new TreeMap<>();
-            getDefaults(defaultValues, new StringBuilder(), patternMap);
+            getDefaults(config, defaultValues, new StringBuilder(), patternMap);
             return defaultValues;
         }
 
-        private void getDefaults(
+        private static void getDefaults(
+                final SmallRyeConfig config,
                 final Map<String, String> defaultValues,
                 final StringBuilder propertyName,
                 final ConfigPatternMap<Container> patternMap) {
@@ -1162,7 +1205,7 @@ private void getDefaults(
             }
 
             for (String childName : patternMap.childNames()) {
-                getDefaults(defaultValues,
+                getDefaults(config, defaultValues,
                         new StringBuilder(propertyName).append(childName.equals(ConfigPatternMap.WILD_CARD) ? "*" : childName),
                         patternMap.getChild(childName));
             }

core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java

@@ -92,6 +92,7 @@
 import io.smallrye.config.ConfigSourceInterceptor;
 import io.smallrye.config.ConfigSourceInterceptorFactory;
 import io.smallrye.config.DefaultValuesConfigSource;
+import io.smallrye.config.ProfileConfigSourceInterceptor;
 import io.smallrye.config.SecretKeysHandler;
 import io.smallrye.config.SecretKeysHandlerFactory;
 import io.smallrye.config.SmallRyeConfig;
@@ -217,6 +218,14 @@ void generateBuilders(
             defaultValues.put(e.getKey(), e.getValue());
         }
         // Recorded values from build time from any other source (higher ordinal then defaults, so override)
+        String[] profiles = ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getProfiles().toArray(String[]::new);
+        for (Map.Entry<String, String> entry : configItem.getReadResult().getRunTimeValues().entrySet()) {
+            // Runtime values may contain active profiled names that override sames names in defaults
+            // We need to keep the original name definition in case a different profile is used to run the app
+            String activeName = ProfileConfigSourceInterceptor.activeName(entry.getKey(), profiles);
+            defaultValues.remove(activeName);
+            defaultValues.put(entry.getKey(), entry.getValue());
+        }
         defaultValues.putAll(configItem.getReadResult().getRunTimeValues());
 
         Set<String> converters = discoverService(Converter.class, reflectiveClass);

devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java

@@ -172,7 +172,8 @@ public Optional<String> checkMissingCommand(CommandLine root, String[] args) {
                 missingCommand.append(currentParseResult.commandSpec().name());
 
                 List<String> unmatchedSubcommands = currentParseResult.unmatched().stream()
-                        .filter(u -> !u.startsWith("-")).collect(Collectors.toList());
+                        .takeWhile(u -> !u.startsWith("-"))
+                        .collect(Collectors.toList());
                 if (!unmatchedSubcommands.isEmpty()) {
                     missingCommand.append("-").append(unmatchedSubcommands.get(0));
                     return Optional.of(missingCommand.toString());

devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java

@@ -331,8 +331,8 @@ public void execute() throws MojoExecutionException {
                 parent.setArtifactId(parentPomModel.getArtifactId());
                 parent.setVersion(parentPomModel.getVersion());
                 subModulePomModel.setParent(parent);
-                MojoUtils.write(parentPomModel, pom);
-                MojoUtils.write(subModulePomModel, subModulePomFile);
+                MojoUtils.writeFormatted(parentPomModel, pom);
+                MojoUtils.writeFormatted(subModulePomModel, subModulePomFile);
             }
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to generate Quarkus project", e);

docs/pom.xml

@@ -27,7 +27,7 @@
         <asciidoctorj-pdf.version>1.5.0-beta.8</asciidoctorj-pdf.version>
         <asciidoctor.fail-if>WARN</asciidoctor.fail-if>
         <roaster-jdt.version>2.26.0.Final</roaster-jdt.version>
-        <maven-model-helper.version>28</maven-model-helper.version>
+        <maven-model-helper.version>35</maven-model-helper.version>
         <eclipse-collections.version>11.1.0</eclipse-collections.version>
         <jgit.version>6.9.0.202403050737-r</jgit.version>
 

docs/src/main/asciidoc/openapi-swaggerui.adoc

@@ -322,6 +322,46 @@ quarkus.smallrye-openapi.info-license-url=https://www.apache.org/licenses/LICENS
 
 This will give you similar information as the `@OpenAPIDefinition` example above.
 
+== Enhancing the OpenAPI Schema with Filters
+
+You can change the Generated OpenAPI Schema using one or more filter. Filters can run during build time, or at runtime.
+
+[source,java]
+----
+/**
+ * Filter to add custom elements
+ */
+@OpenApiFilter(OpenApiFilter.RunStage.BUILD) //<1>
+public class MyBuildTimeFilter implements OASFilter { //<2>
+
+    private IndexView view;
+
+    public MyBuildTimeFilter(IndexView view) { //<3>
+        this.view = view;
+    }
+
+    @Override
+    public void filterOpenAPI(OpenAPI openAPI) { //<4>
+        Collection<ClassInfo> knownClasses = this.view.getKnownClasses();
+        Info info = OASFactory.createInfo();
+        info.setDescription("Created from Annotated Buildtime filter with " + knownClasses.size() + " known indexed classes");
+        openAPI.setInfo(info);
+    }
+
+}
+----
+<1> Annotate method with `@OpenApiFilter` and the run stage (BUILD,RUN,BOTH)
+<2> Implement OASFilter and override any of the methods
+<3> For Build stage filters, the index can be passed in (optional)
+<4> Get a hold of the generated `OpenAPI` Schema, and enhance as required
+
+Remember that setting fields on the schema will override what has been generated, you might want to get and add to (so modify). Also know that the generated values might be null, so you will have to check for that.
+
+=== Runtime filters
+
+Runtime filters by default runs on startup (when the final OpenAPI document gets created). You can change runtime filters to run on every request, making the openapi document dynamic.
+To do this you need to set this propery: `quarkus.smallrye-openapi.always-run-filter=true`.
+
 == Loading OpenAPI Schema From Static Files
 
 Instead of dynamically creating OpenAPI schemas from annotation scanning, Quarkus also supports serving static OpenAPI documents.