Merge pull request #49927 from jmartisk/3.26.3-backports-2

[3.26] 3.26.3 backports 2

Author: jmartisk

bom/application/pom.xml

@@ -109,10 +109,10 @@
         <slf4j-jboss-logmanager.version>2.0.0.Final</slf4j-jboss-logmanager.version>
         <wildfly-common.version>2.0.1</wildfly-common.version>
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
-        <wildfly-elytron.version>2.6.4.Final</wildfly-elytron.version>
+        <wildfly-elytron.version>2.6.5.Final</wildfly-elytron.version>
         <jboss-marshalling.version>2.2.3.Final</jboss-marshalling.version>
         <jboss-threads.version>3.9.1</jboss-threads.version>
-        <vertx.version>4.5.20</vertx.version>
+        <vertx.version>4.5.21</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpasync.version>4.1.5</httpasync.version>
@@ -134,7 +134,7 @@
         <infinispan.version>15.0.19.Final</infinispan.version>
         <infinispan.protostream.version>5.0.13.Final</infinispan.protostream.version>
         <caffeine.version>3.2.2</caffeine.version>
-        <netty.version>4.1.124.Final</netty.version>
+        <netty.version>4.1.127.Final</netty.version>
         <brotli4j.version>1.16.0</brotli4j.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>

docs/src/main/asciidoc/extension-registry-user.adoc

@@ -214,3 +214,26 @@ image:registry-nexus-repository.png[Nexus Repository Proxy]
 - Set the `Remote Storage` URL to `https://registry.quarkus.io/maven`
 
 image:registry-nexus3-repository.png[Nexus Repository Proxy]
+
+==== Environment Variables
+
+Applications using a registry client can be configured using environment variables.
+
+`QUARKUS_REGISTRIES` environment variable can be used to specify which registries should be enabled as a comma-separated list of registry IDs.
+For example
+```
+QUARKUS_REGISTRIES=registry.acme.org,registry.quarkus.io
+```
+That alone will be enough to initialize a registry client to pull extension catalogs from two registries using their default configurations.
+
+Certain registry options could be initialized with their specific environment variables. Each such option will have the following environment variable prefix:
+```
+QUARKUS_REGISTRY_<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>_
+```
+where `<UPPERCASED_AND_UNDERSCORED_REGISTRY_ID>` is a registry ID with each character converted to uppercase and a `.` replaced with `_`. For example, `REGISTRY_ACME_ORG`.
+
+The following options can be configured with this approach:
+
+- Repository URL, for example `QUARKUS_REGISTRY_REGISTRY_ACME_ORG_REPO_URL=https://internal.registry.acme.org/maven`
+- Update policy, for example `QUARKUS_REGISTRY_REGISTRY_ACME_ORG_UPDATE_POLICY=always`
+- Offering, for example `QUARKUS_REGISTRY_REGISTRY_ACME_ORG_OFFERING=acme-magic`

extensions/devui/resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js

@@ -1,4 +1,5 @@
 import { QwcHotReloadElement, html, css} from 'qwc-hot-reload-element';
+import { StorageController } from 'storage-controller';
 import { JsonRpc } from 'jsonrpc';
 import '@vaadin/vertical-layout';
 import '@vaadin/icon';
@@ -22,6 +23,7 @@ ring.register();
  */
 export class QwcContinuousTesting extends QwcHotReloadElement {
     jsonRpc = new JsonRpc(this, false);
+    storageControl = new StorageController(this, true);
 
     static styles = css`
         :host {
@@ -91,7 +93,7 @@ export class QwcContinuousTesting extends QwcHotReloadElement {
         this._detailsOpenedItem = [];
         this._chartTitles = ["passed", "failed", "skipped"];
         this._chartColors = ['--lumo-success-text-color', '--lumo-error-text-color', '--lumo-contrast-70pct'];
-        this._displayTags = true;
+        this._displayTags = this.storageControl.get("displayTags");
     }
 
     set _tests(value) {
@@ -269,12 +271,12 @@ export class QwcContinuousTesting extends QwcHotReloadElement {
                 >
                 ${
                     this._displayTags && this._hasTestResultWithTags
-                    ? html`<vaadin-grid-sort-column path="tags" header="Tags" ${columnBodyRenderer((prop) => this._tagsRenderer(prop), [])}></vaadin-grid-sort-column>`
+                    ? html`<vaadin-grid-sort-column path="tags" header="Tags" ${columnBodyRenderer((prop) => this._tagsRenderer(prop), [])} resizable width="40px"></vaadin-grid-sort-column>`
                     : ''
                 }
-                <vaadin-grid-sort-column path="testClass" header="Test Class" ${columnBodyRenderer((prop) => this._testRenderer(prop), [])}></vaadin-grid-sort-column>
-                <vaadin-grid-sort-column path="displayName" header="Name" ${columnBodyRenderer((prop) => this._nameRenderer(prop), [])}></vaadin-grid-sort-column>
-                <vaadin-grid-sort-column path="time" header="Time" ${columnBodyRenderer((prop) => this._timeRenderer(prop), [])}>></vaadin-grid-sort-column>
+                <vaadin-grid-sort-column path="testClass" header="Test Class" ${columnBodyRenderer((prop) => this._testRenderer(prop), [])} resizable auto-width></vaadin-grid-sort-column>
+                <vaadin-grid-sort-column path="displayName" header="Name" ${columnBodyRenderer((prop) => this._nameRenderer(prop), [])} resizable auto-width></vaadin-grid-sort-column>
+                <vaadin-grid-sort-column path="time" header="Time" ${columnBodyRenderer((prop) => this._timeRenderer(prop), [])} width="10px" flexGrow = 0></vaadin-grid-sort-column>
             </vaadin-grid>`;
 
         }else{
@@ -477,6 +479,7 @@ export class QwcContinuousTesting extends QwcHotReloadElement {
 
     _toggleDisplayTags(){
         this._displayTags = !this._displayTags;
+        this.storageControl.set('displayTags', this._displayTags);
     }
 }
 customElements.define('qwc-continuous-testing', QwcContinuousTesting);

extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java

@@ -15,9 +15,13 @@ public class OidcConfigurationMetadata {
     public static final String JWKS_ENDPOINT = "jwks_uri";
     public static final String USERINFO_ENDPOINT = "userinfo_endpoint";
     public static final String END_SESSION_ENDPOINT = "end_session_endpoint";
-    private static final String REGISTRATION_ENDPOINT = "registration_endpoint";
-    private static final String REVOCATION_ENDPOINT = "revocation_endpoint";
+    public static final String REGISTRATION_ENDPOINT = "registration_endpoint";
+    public static final String REVOCATION_ENDPOINT = "revocation_endpoint";
     public static final String SCOPES_SUPPORTED = "scopes_supported";
+    public static final String RESPONSE_TYPES_SUPPORTED = "response_types_supported";
+    public static final String SUBJECT_TYPES_SUPPORTED = "subject_types_supported";
+    public static final String ID_TOKEN_SIGNING_ALGORITHMS_SUPPORTED = "id_token_signing_alg_values_supported";
+    public static final String CODE_CHALLENGE_METHODS_SUPPORTED = "code_challenge_methods_supported";
 
     private final String discoveryUri;
     private final String tokenUri;
@@ -125,6 +129,22 @@ public List<String> getSupportedScopes() {
         return getStringList(SCOPES_SUPPORTED);
     }
 
+    public List<String> getSupportedResponseTypes() {
+        return getStringList(RESPONSE_TYPES_SUPPORTED);
+    }
+
+    public List<String> getSupportedSubjectTypes() {
+        return getStringList(SUBJECT_TYPES_SUPPORTED);
+    }
+
+    public List<String> getSupportedIdTokenSigningAlgorithms() {
+        return getStringList(ID_TOKEN_SIGNING_ALGORITHMS_SUPPORTED);
+    }
+
+    public List<String> getSupportedCodeChallengeMethods() {
+        return getStringList(CODE_CHALLENGE_METHODS_SUPPORTED);
+    }
+
     public String getIssuer() {
         return issuer;
     }

extensions/opentelemetry/runtime/src/test/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/VertxUtilTest.java

@@ -112,6 +112,11 @@ public String uri() {
                 return null;
             }
 
+            @Override
+            public @Nullable HostAndPort authority(boolean b) {
+                return null;
+            }
+
             @Override
             public @Nullable String host() {
                 return "";

extensions/resteasy-reactive/rest-client/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java

@@ -344,7 +344,7 @@ void registerProvidersFromAnnotations(CombinedIndexBuildItem indexBuildItem,
 
             }
 
-            addGeneratedProviders(index, constructor, annotationsByClassName, generatedProviders);
+            addGeneratedProviders(index, classCreator, constructor, annotationsByClassName, generatedProviders);
 
             constructor.returnValue(null);
         }
@@ -769,11 +769,13 @@ private Map<String, GeneratedClassResult> populateClientProviderFromAnnotations(
         return result;
     }
 
-    private void addGeneratedProviders(IndexView index, MethodCreator constructor,
+    private void addGeneratedProviders(IndexView index, ClassCreator classCreator, MethodCreator constructor,
             Map<String, List<AnnotationInstance>> annotationsByClassName,
             Map<String, List<GeneratedClassResult>> generatedProviders) {
+        int i = 1;
         for (Map.Entry<String, List<AnnotationInstance>> annotationsForClass : annotationsByClassName.entrySet()) {
-            ResultHandle map = constructor.newInstance(MethodDescriptor.ofConstructor(HashMap.class));
+            MethodCreator mc = classCreator.getMethodCreator("addGeneratedProviders" + i, void.class);
+            ResultHandle map = mc.newInstance(MethodDescriptor.ofConstructor(HashMap.class));
             for (AnnotationInstance value : annotationsForClass.getValue()) {
                 String className = value.value().asString();
                 AnnotationValue priorityAnnotationValue = value.value("priority");
@@ -784,21 +786,26 @@ private void addGeneratedProviders(IndexView index, MethodCreator constructor,
                     priority = priorityAnnotationValue.asInt();
                 }
 
-                constructor.invokeInterfaceMethod(MAP_PUT, map, constructor.loadClassFromTCCL(className),
-                        constructor.load(priority));
+                mc.invokeInterfaceMethod(MAP_PUT, map, mc.loadClassFromTCCL(className),
+                        mc.load(priority));
             }
             String ifaceName = annotationsForClass.getKey();
             if (generatedProviders.containsKey(ifaceName)) {
                 // remove the interface from the generated provider since it's going to be handled now
                 // the remaining entries will be handled later
                 List<GeneratedClassResult> providers = generatedProviders.remove(ifaceName);
                 for (GeneratedClassResult classResult : providers) {
-                    constructor.invokeInterfaceMethod(MAP_PUT, map, constructor.loadClass(classResult.generatedClassName),
-                            constructor.load(classResult.priority));
+                    mc.invokeInterfaceMethod(MAP_PUT, map, mc.loadClass(classResult.generatedClassName),
+                            mc.load(classResult.priority));
                 }
 
             }
-            addProviders(constructor, ifaceName, map);
+            addProviders(mc, ifaceName, map);
+            mc.returnVoid();
+
+            constructor.invokeVirtualMethod(mc.getMethodDescriptor(), constructor.getThis());
+
+            i++;
         }
 
         for (Map.Entry<String, List<GeneratedClassResult>> entry : generatedProviders.entrySet()) {
@@ -812,11 +819,11 @@ private void addGeneratedProviders(IndexView index, MethodCreator constructor,
         }
     }
 
-    private void addProviders(MethodCreator constructor, String providerClass, ResultHandle map) {
-        constructor.invokeVirtualMethod(
+    private void addProviders(MethodCreator mc, String providerClass, ResultHandle map) {
+        mc.invokeVirtualMethod(
                 MethodDescriptor.ofMethod(AnnotationRegisteredProviders.class, "addProviders", void.class, String.class,
                         Map.class),
-                constructor.getThis(), constructor.load(providerClass), map);
+                mc.getThis(), mc.load(providerClass), map);
     }
 
     private int getAnnotatedPriority(IndexView index, String className, int defaultPriority) {

extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedServerRequestWrapper.java

@@ -197,6 +197,14 @@ public HostAndPort authority() {
         return forwardedParser.authority();
     }
 
+    @Override
+    public HostAndPort authority(boolean real) {
+        if (real) {
+            return delegate.authority();
+        }
+        return this.authority();
+    }
+
     @Override
     public boolean isValidAuthority() {
         return forwardedParser.authority() != null;

independent-projects/resteasy-reactive/pom.xml

@@ -57,7 +57,7 @@
 
         <mutiny.version>2.9.4</mutiny.version>
         <smallrye-common.version>2.13.8</smallrye-common.version>
-        <vertx.version>4.5.20</vertx.version>
+        <vertx.version>4.5.21</vertx.version>
         <rest-assured.version>5.5.6</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <jackson-bom.version>2.19.2</jackson-bom.version>

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java

@@ -57,15 +57,7 @@ public MavenRegistryClientFactory(MavenArtifactResolver resolver, MessageWriter
     public RegistryClient buildRegistryClient(RegistryConfig config) throws RegistryResolutionException {
         Objects.requireNonNull(config, "The registry config is null");
 
-        final RegistryDescriptorConfig descriptorConfig = config.getDescriptor();
-        if (descriptorConfig == null) {
-            throw new IllegalArgumentException("The registry descriptor configuration is missing for " + config.getId());
-        }
-
-        final ArtifactCoords originalDescrCoords = descriptorConfig.getArtifact();
-        final Artifact registryDescriptorCoords = new DefaultArtifact(originalDescrCoords.getGroupId(),
-                originalDescrCoords.getArtifactId(), originalDescrCoords.getClassifier(), originalDescrCoords.getType(),
-                originalDescrCoords.getVersion());
+        final Artifact registryDescriptorCoords = getDescriptorCoords(config);
 
         final boolean cleanupTimestampedArtifacts = isCleanupTimestampedArtifacts(config);
 
@@ -172,6 +164,17 @@ public RegistryClient buildRegistryClient(RegistryConfig config) throws Registry
                 new MavenRegistryCache(config, defaultResolver, log));
     }
 
+    private static Artifact getDescriptorCoords(RegistryConfig config) {
+        final RegistryDescriptorConfig descriptorConfig = config.getDescriptor();
+        if (descriptorConfig == null) {
+            throw new IllegalArgumentException("The registry descriptor configuration is missing for " + config.getId());
+        }
+        final ArtifactCoords originalDescrCoords = descriptorConfig.getArtifact();
+        return new DefaultArtifact(originalDescrCoords.getGroupId(),
+                originalDescrCoords.getArtifactId(), originalDescrCoords.getClassifier(), originalDescrCoords.getType(),
+                originalDescrCoords.getVersion());
+    }
+
     private static boolean isCleanupTimestampedArtifacts(RegistryConfig config) {
         final Object o = config.getExtra().get(CLEANUP_TIMESTAMPED_ARTIFACTS);
         return o == null || Boolean.parseBoolean(o.toString());

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java

@@ -8,6 +8,8 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
+import io.quarkus.registry.Constants;
+
 /**
  * A helper class set utility methods to locate the registry client configuration file
  * in the default locations (e.g. user home <code>.quarkus</code> dir, or the project dir) or in
@@ -188,6 +190,8 @@ static RegistriesConfig initFromEnvironmentOrNull(Map<String, String> map) {
                                     .setUrl(var.getValue())
                                     .build())
                             .build());
+                } else if (isEnvVarOption(var.getKey(), envvarPrefix, "OFFERING")) {
+                    builder.setExtra(Map.of(Constants.OFFERING, var.getValue()));
                 }
             }