Merge branch 'main' into 39375-jaxb-exception

.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

.github/native-tests.json

@@ -38,8 +38,8 @@
         },
         {
             "category": "Data6",
-            "timeout": 95,
-            "test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-outbox-polling",
+            "timeout": 105,
+            "test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-outbox-polling, hibernate-search-standalone-elasticsearch, hibernate-search-standalone-opensearch",
             "os-name": "ubuntu-latest"
         },
         {

.mvn/extensions.xml

@@ -12,11 +12,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>quarkus-build-caching-extension</artifactId>
-        <version>0.10</version>
+        <version>0.12</version>
     </extension>
     <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

@@ -20,7 +20,7 @@
         <bouncycastle.tls.fips.version>1.0.18</bouncycastle.tls.fips.version>
         <expressly.version>5.0.0</expressly.version>
         <findbugs.version>3.0.2</findbugs.version>
-        <jandex.version>3.1.6</jandex.version>
+        <jandex.version>3.1.7</jandex.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.inject.version>1</javax.inject.version>
         <parsson.version>1.1.5</parsson.version>
@@ -51,18 +51,18 @@
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1.1</microprofile-openapi.version>
         <smallrye-common.version>2.3.0</smallrye-common.version>
-        <smallrye-config.version>3.6.1</smallrye-config.version>
+        <smallrye-config.version>3.7.1</smallrye-config.version>
         <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.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.10.0</smallrye-mutiny-vertx-binding.version>
-        <smallrye-reactive-messaging.version>4.18.0</smallrye-reactive-messaging.version>
+        <smallrye-mutiny-vertx-binding.version>3.11.0</smallrye-mutiny-vertx-binding.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>
@@ -121,15 +121,15 @@
         <wildfly-common.version>1.7.0.Final</wildfly-common.version>
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>2.3.1.Final</wildfly-elytron.version>
-        <jboss-threads.version>3.5.1.Final</jboss-threads.version>
-        <vertx.version>4.5.4</vertx.version>
+        <jboss-threads.version>3.6.0.Final</jboss-threads.version>
+        <vertx.version>4.5.5</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpasync.version>4.1.5</httpasync.version>
         <cronutils.version>9.2.1</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
         <h2.version>2.2.224</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
-        <postgresql-jdbc.version>42.7.2</postgresql-jdbc.version>
+        <postgresql-jdbc.version>42.7.3</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.3.3</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
         <mssql-jdbc.version>12.6.1.jre11</mssql-jdbc.version>
@@ -157,7 +157,7 @@
         <scala.version>2.13.13</scala.version>
         <aws-lambda-java.version>1.2.3</aws-lambda-java.version>
         <aws-lambda-java-events.version>3.11.3</aws-lambda-java-events.version>
-        <aws-xray.version>2.15.1</aws-xray.version>
+        <aws-xray.version>2.15.2</aws-xray.version>
         <azure-functions-java-library.version>2.2.0</azure-functions-java-library.version>
         <azure-functions-java-spi.version>1.0.0</azure-functions-java-spi.version>
         <kotlin.version>1.9.23</kotlin.version>
@@ -166,9 +166,9 @@
         <kotlin-serialization.version>1.6.2</kotlin-serialization.version>
         <dekorate.version>4.1.2</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
         <maven-invoker.version>3.2.0</maven-invoker.version>
-        <awaitility.version>4.2.0</awaitility.version>
+        <awaitility.version>4.2.1</awaitility.version>
         <jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
-        <flyway.version>9.22.3</flyway.version>
+        <flyway.version>10.10.0</flyway.version>
         <yasson.version>3.0.3</yasson.version>
         <!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
         <liquibase.version>4.26.0</liquibase.version>
@@ -205,7 +205,7 @@
         <log4j2-api.version>2.23.1</log4j2-api.version>
         <log4j-jboss-logmanager.version>1.3.0.Final</log4j-jboss-logmanager.version>
         <avro.version>1.11.3</avro.version>
-        <apicurio-registry.version>2.5.9.Final</apicurio-registry.version>
+        <apicurio-registry.version>2.5.10.Final</apicurio-registry.version>
         <apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
         <testcontainers.version>1.19.7</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.3.5</docker-java.version> <!-- must be the version Testcontainers use -->
@@ -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>
@@ -1230,6 +1231,16 @@
                 <artifactId>quarkus-hibernate-search-orm-outbox-polling-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-search-standalone-elasticsearch</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-search-standalone-elasticsearch-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-hibernate-validator</artifactId>
@@ -4239,6 +4250,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>
@@ -5691,6 +5707,26 @@
                 <artifactId>flyway-database-oracle</artifactId>
                 <version>${flyway.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-database-postgresql</artifactId>
+                <version>${flyway.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-database-db2</artifactId>
+                <version>${flyway.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-database-derby</artifactId>
+                <version>${flyway.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-database-mongodb</artifactId>
+                <version>${flyway.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.liquibase</groupId>
                 <artifactId>liquibase-core</artifactId>

build-parent/pom.xml

@@ -33,7 +33,7 @@
         <failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>
 
         <!-- Jandex versions -->
-        <jandex.version>3.1.6</jandex.version>
+        <jandex.version>3.1.7</jandex.version>
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.12</asciidoctorj.version>
@@ -44,7 +44,7 @@
 
         <!-- Dev tools -->
         <freemarker.version>2.3.32</freemarker.version>
-        <commonmark.version>0.21.0</commonmark.version>
+        <commonmark.version>0.22.0</commonmark.version>
 
         <!-- Arquillian BOM -->
         <arquillian.version>1.7.0.Final</arquillian.version>
@@ -112,11 +112,11 @@
         <keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.version}</keycloak.docker.image>
         <keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy</keycloak.docker.legacy.image>
 
-        <unboundid-ldap.version>6.0.11</unboundid-ldap.version>
+        <unboundid-ldap.version>7.0.0</unboundid-ldap.version>
 
         <assertj.version>3.25.3</assertj.version>
 
-        <wiremock.version>3.4.1</wiremock.version>
+        <wiremock.version>3.4.2</wiremock.version>
         <wiremock-maven-plugin.version>7.3.0</wiremock-maven-plugin.version>
 
         <!-- Artemis test dependencies -->
@@ -638,7 +638,7 @@
                         <dependency>
                             <groupId>org.apache.groovy</groupId>
                             <artifactId>groovy</artifactId>
-                            <version>4.0.19</version>
+                            <version>4.0.20</version>
                         </dependency>
                     </dependencies>
                 </plugin>

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

@@ -9,6 +9,7 @@
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.bootstrap.model.PathsCollection;
 import io.quarkus.maven.dependency.ArtifactKey;
+import io.quarkus.maven.dependency.ResolvedDependency;
 import io.quarkus.paths.OpenPathTree;
 import io.quarkus.paths.PathCollection;
 
@@ -83,6 +84,12 @@ public interface ApplicationArchive {
      */
     ArtifactKey getKey();
 
+    /**
+     *
+     * @return the resolved artifact or {@code null} if not available
+     */
+    ResolvedDependency getResolvedDependency();
+
     /**
      * Applies a function to the content tree of the archive.
      *

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

@@ -12,6 +12,7 @@
 import io.quarkus.bootstrap.model.PathsCollection;
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.maven.dependency.ArtifactKey;
+import io.quarkus.maven.dependency.ResolvedDependency;
 import io.quarkus.paths.OpenPathTree;
 import io.quarkus.paths.PathCollection;
 import io.quarkus.paths.PathList;
@@ -20,12 +21,12 @@ public final class ApplicationArchiveImpl extends MultiBuildItem implements Appl
 
     private final IndexView indexView;
     private final OpenPathTree openTree;
-    private final ArtifactKey artifactKey;
+    private final ResolvedDependency resolvedDependency;
 
-    public ApplicationArchiveImpl(IndexView indexView, OpenPathTree openTree, ArtifactKey artifactKey) {
+    public ApplicationArchiveImpl(IndexView indexView, OpenPathTree openTree, ResolvedDependency resolvedDependency) {
         this.indexView = indexView;
         this.openTree = openTree;
-        this.artifactKey = artifactKey;
+        this.resolvedDependency = resolvedDependency;
     }
 
     @Override
@@ -68,14 +69,22 @@ public PathCollection getResolvedPaths() {
      * @return archive key
      */
     public AppArtifactKey getArtifactKey() {
-        return artifactKey == null ? null
-                : new AppArtifactKey(artifactKey.getGroupId(), artifactKey.getArtifactId(), artifactKey.getClassifier(),
-                        artifactKey.getType());
+        if (resolvedDependency == null) {
+            return null;
+        }
+        ArtifactKey artifactKey = resolvedDependency.getKey();
+        return new AppArtifactKey(artifactKey.getGroupId(), artifactKey.getArtifactId(), artifactKey.getClassifier(),
+                artifactKey.getType());
     }
 
     @Override
     public ArtifactKey getKey() {
-        return artifactKey;
+        return resolvedDependency != null ? resolvedDependency.getKey() : null;
+    }
+
+    @Override
+    public ResolvedDependency getResolvedDependency() {
+        return resolvedDependency;
     }
 
     @Override

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

@@ -37,6 +37,7 @@ public enum Feature {
     HIBERNATE_REACTIVE_PANACHE_KOTLIN,
     HIBERNATE_REACTIVE_REST_DATA_PANACHE,
     HIBERNATE_SEARCH_ELASTICSEARCH,
+    HIBERNATE_SEARCH_STANDALONE_ELASTICSEARCH,
     HIBERNATE_VALIDATOR,
     INFINISPAN_CLIENT,
     INFINISPAN_EMBEDDED,

core/deployment/src/main/java/io/quarkus/deployment/cmd/RunCommandProcessor.java

@@ -1,5 +1,6 @@
 package io.quarkus.deployment.cmd;
 
+import static io.quarkus.deployment.pkg.PackageConfig.JarConfig.JarType.*;
 import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.DEFAULT_FAST_JAR_DIRECTORY_NAME;
 import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.QUARKUS_RUN_JAR;
 
@@ -25,6 +26,7 @@ public RunCommandActionResultBuildItem commands(List<RunCommandActionBuildItem>
         return new RunCommandActionResultBuildItem(cmds);
     }
 
+    @SuppressWarnings("deprecation") // legacy jar
     @BuildStep
     public void defaultJavaCommand(PackageConfig packageConfig,
             OutputTargetBuildItem jar,
@@ -34,13 +36,14 @@ public void defaultJavaCommand(PackageConfig packageConfig,
 
         Path jarPath = null;
         if (legacyJarRequired.isEmpty() && (!uberJarRequired.isEmpty()
-                || packageConfig.type.equalsIgnoreCase(PackageConfig.UBER_JAR))) {
+                || packageConfig.jar().type() == UBER_JAR)) {
             jarPath = jar.getOutputDirectory()
-                    .resolve(jar.getBaseName() + packageConfig.getRunnerSuffix() + ".jar");
-        } else if (!legacyJarRequired.isEmpty() || packageConfig.isLegacyJar()
-                || packageConfig.type.equalsIgnoreCase(PackageConfig.LEGACY)) {
+                    .resolve(jar.getBaseName() + packageConfig.computedRunnerSuffix() + ".jar");
+        } else if (!legacyJarRequired.isEmpty()
+                || packageConfig.jar().type() == LEGACY_JAR) {
+            // todo: legacy JAR should be using runnerSuffix()
             jarPath = jar.getOutputDirectory()
-                    .resolve(jar.getBaseName() + packageConfig.getRunnerSuffix() + ".jar");
+                    .resolve(jar.getBaseName() + packageConfig.computedRunnerSuffix() + ".jar");
         } else {
             jarPath = jar.getOutputDirectory().resolve(DEFAULT_FAST_JAR_DIRECTORY_NAME).resolve(QUARKUS_RUN_JAR);
 
@@ -49,7 +52,7 @@ public void defaultJavaCommand(PackageConfig packageConfig,
         List<String> args = new ArrayList<>();
         args.add(determineJavaPath());
 
-        for (Map.Entry e : System.getProperties().entrySet()) {
+        for (Map.Entry<?, ?> e : System.getProperties().entrySet()) {
             args.add("-D" + e.getKey().toString() + "=" + e.getValue().toString());
         }
         args.add("-jar");

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

@@ -410,6 +410,7 @@ public SmallRyeConfig initConfiguration(LaunchMode launchMode, Properties buildS
         }
 
         builder.withInterceptors(buildConfigTracker);
+        builder.withInterceptors(ConfigCompatibility.FrontEnd.instance(), ConfigCompatibility.BackEnd.instance());
         var config = builder.build();
         buildConfigTracker.configure(config);
         return config;