Merge pull request #42420 from gsmet/3.13.2-backports-1

[3.13] 3.13.2 backports 1

Author: gsmet

bom/application/pom.xml

@@ -34,7 +34,7 @@
         <opentelemetry.version>1.39.0</opentelemetry.version>
         <opentelemetry-alpha.version>2.5.0-alpha</opentelemetry-alpha.version>
         <opentelemetry-semconv.version>1.25.0-alpha</opentelemetry-semconv.version>
-        <quarkus-http.version>5.3.0</quarkus-http.version>
+        <quarkus-http.version>5.3.1</quarkus-http.version>
         <micrometer.version>1.12.5</micrometer.version><!-- keep in sync with hdrhistogram -->
         <hdrhistogram.version>2.1.12</hdrhistogram.version><!-- keep in sync with micrometer -->
         <google-auth.version>0.22.0</google-auth.version>
@@ -55,7 +55,7 @@
         <smallrye-health.version>4.1.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.10.0</smallrye-open-api.version>
-        <smallrye-graphql.version>2.9.0</smallrye-graphql.version>
+        <smallrye-graphql.version>2.9.1</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.3.0</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.5.3</smallrye-jwt.version>
         <smallrye-context-propagation.version>2.1.2</smallrye-context-propagation.version>

core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -19,6 +20,10 @@
 import org.jboss.jandex.Type;
 
 public class ClassComparisonUtil {
+    private static final Set<DotName> IGNORED_ANNOTATIONS = Set.of(
+            DotName.createSimple("kotlin.jvm.internal.SourceDebugExtension"),
+            DotName.createSimple("kotlin.Metadata"));
+
     static boolean isSameStructure(ClassInfo clazz, ClassInfo old) {
         if (clazz.flags() != old.flags()) {
             return false;
@@ -161,6 +166,9 @@ private static void methodMap(Collection<AnnotationInstance> b, List<AnnotationI
     }
 
     private static boolean compareAnnotation(AnnotationInstance a, AnnotationInstance b) {
+        if (IGNORED_ANNOTATIONS.contains(a.name())) {
+            return true;
+        }
         List<AnnotationValue> valuesA = a.values();
         List<AnnotationValue> valuesB = b.values();
         if (valuesA.size() != valuesB.size()) {

docs/src/main/asciidoc/hibernate-orm.adoc

@@ -263,7 +263,7 @@ Since we're targeting CockroachDB here, we're passing the CockroachDB version, n
 <2> Set the Hibernate ORM dialect.
 
 [[hibernate-dialect-varying-database]]
-== Varying database
+==== Varying database
 
 When enabling <<database-approach,database multi-tenancy>>,
 Hibernate ORM will use multiple datasources at runtime for the same persistence unit,

docs/src/main/asciidoc/security-keycloak-authorization.adoc

@@ -524,7 +524,7 @@ For example:
 quarkus.keycloak.policy-enforcer.enable=true
 
 # Default Tenant
-quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus
 quarkus.oidc.client-id=quarkus-app
 quarkus.oidc.credentials.secret=secret
 
@@ -535,7 +535,7 @@ quarkus.keycloak.policy-enforcer.paths.1.claim-information-point.claims.static-c
 
 # Service Tenant
 
-quarkus.oidc.service-tenant.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.service-tenant.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus
 quarkus.oidc.service-tenant.client-id=quarkus-app
 quarkus.oidc.service-tenant.credentials.secret=secret
 
@@ -547,7 +547,7 @@ quarkus.keycloak.service-tenant.policy-enforcer.paths.1.claim-information-point.
 
 # WebApp Tenant
 
-quarkus.oidc.webapp-tenant.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.webapp-tenant.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus
 quarkus.oidc.webapp-tenant.client-id=quarkus-app
 quarkus.oidc.webapp-tenant.credentials.secret=secret
 quarkus.oidc.webapp-tenant.application-type=web-app

docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc

@@ -602,7 +602,7 @@ For example:
 [source, properties]
 ----
 # keycloak.url is set by OidcWiremockTestResource
-quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus/
 quarkus.oidc.client-id=quarkus-service-app
 quarkus.oidc.application-type=service
 ----
@@ -914,7 +914,7 @@ Prepare the REST test endpoint and set `application.properties` as outlined in t
 [source, properties]
 ----
 # keycloak.url is set by KeycloakTestResourceLifecycleManager
-quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus/
 quarkus.oidc.client-id=quarkus-service-app
 quarkus.oidc.credentials=secret
 quarkus.oidc.application-type=service

docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc

@@ -1737,7 +1737,7 @@ For example:
 [source, properties]
 ----
 # keycloak.url is set by OidcWiremockTestResource
-quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus/
 quarkus.oidc.client-id=quarkus-web-app
 quarkus.oidc.credentials.secret=secret
 quarkus.oidc.application-type=web-app

docs/src/main/asciidoc/security-openid-connect-client-reference.adoc

@@ -1034,7 +1034,7 @@ Set `application.properties`, for example:
 [source, properties]
 ----
 # Use the 'keycloak.url' property set by the test KeycloakRealmResourceManager
-quarkus.oidc-client.auth-server-url=${keycloak.url}
+quarkus.oidc-client.auth-server-url=${keycloak.url:replaced-by-test-resource}
 quarkus.oidc-client.discovery-enabled=false
 quarkus.oidc-client.token-path=/tokens
 quarkus.oidc-client.client-id=quarkus-service-app

docs/src/main/asciidoc/websockets-next-reference.adoc

@@ -108,6 +108,8 @@ public class ChatWebSocket {
 Thus, client can connect to this web socket endpoint using `ws://localhost:8080/chat/your-name`.
 If TLS is used, the URL is `wss://localhost:8443/chat/your-name`.
 
+NOTE: The endpoint path is relative to the xref:http-reference.adoc#context-path[root context] configured by the `quarkus.http.root-path` (which is `/` by default). For example, if you add `quarkus.http.root-path=/api` to your `application.properties` then a client can connect to this endpoint using `http://localhost:8080/api/chat/the-name`. 
+
 [[client-endpoints]]
 === Client endpoints
 

docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java

@@ -85,7 +85,7 @@ public CheckCrossReferences(Path srcDir, Path referenceIndexPath)
 
         if (!Files.exists(referenceIndexPath) || !Files.isReadable(referenceIndexPath)) {
             throw new IllegalStateException(
-                    String.format("Reference index does not exist or is not readable", referenceIndexPath.toAbsolutePath()));
+                    String.format("Reference index %s does not exist or is not readable", referenceIndexPath.toAbsolutePath()));
         }
 
         ObjectMapper om = new ObjectMapper(new YAMLFactory().enable(YAMLGenerator.Feature.MINIMIZE_QUOTES));

extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java

@@ -41,7 +41,7 @@ public String delete() {
             AuditReader auditReader = AuditReaderFactory.get(em);
             List<Number> revisions = auditReader.getRevisions(MyAuditedEntity.class, entity.getId());
             if (revisions.size() != 2) {
-                throw new IllegalStateException(String.format("found {} revisions", revisions.size()));
+                throw new IllegalStateException(String.format("found %d revisions", revisions.size()));
             }
 
             for (Number revision : revisions) {