Merge pull request #50681 from gsmet/3.27.1-backports-2

[3.27] 3.27.1 backports 2

Author: jmartisk

.mvn/extensions.xml

@@ -17,7 +17,7 @@
     <extension>
         <groupId>io.quarkus.develocity</groupId>
         <artifactId>quarkus-project-develocity-extension</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
     </extension>
     <extension>
         <groupId>eu.maveniverse.maven.nisse</groupId>

bom/application/pom.xml

@@ -16,8 +16,8 @@
     <properties>
         <angus-activation.version>2.0.2</angus-activation.version>
         <angus-mail.version>2.0.4</angus-mail.version> <!-- keep in sync with angus-activation (mail depends on activation) -->
-        <bouncycastle.version>1.81</bouncycastle.version>
-        <bouncycastle.fips.version>2.1.1</bouncycastle.fips.version>
+        <bouncycastle.version>1.82</bouncycastle.version>
+        <bouncycastle.fips.version>2.1.2</bouncycastle.fips.version>
         <bouncycastle.tls.fips.version>2.1.20</bouncycastle.tls.fips.version>
         <cyclonedx.version>9.0.5</cyclonedx.version>
         <expressly.version>6.0.0</expressly.version>
@@ -101,7 +101,7 @@
         <narayana-lra.version>1.0.2.Final</narayana-lra.version>
         <agroal.version>2.8</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-opensource-components.version>9.1.4</elasticsearch-opensource-components.version>
+        <elasticsearch-opensource-components.version>9.1.5</elasticsearch-opensource-components.version>
         <rxjava.version>2.2.21</rxjava.version>
         <wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
         <wildfly.openssl-linux.version>2.2.2.SP01</wildfly.openssl-linux.version>

build-parent/pom.xml

@@ -74,7 +74,7 @@
         <volume.access.modifier>:Z</volume.access.modifier>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>9.1.4</elasticsearch-server.version>
+        <elasticsearch-server.version>9.1.5</elasticsearch-server.version>
         <elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
         <logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
         <kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>
@@ -97,7 +97,7 @@
         <junit4.version>4.13.2</junit4.version>
 
         <!-- The image to use for tests that run Keycloak -->
-        <keycloak.server.version>26.3.0</keycloak.server.version>
+        <keycloak.server.version>26.3.4</keycloak.server.version>
         <keycloak.wildfly.version>19.0.3</keycloak.wildfly.version>
         <keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.server.version}</keycloak.docker.image>
         <keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy</keycloak.docker.legacy.image>

core/deployment/src/main/java/io/quarkus/deployment/builditem/DevServicesResultBuildItem.java

@@ -245,6 +245,11 @@ public OwnedServiceBuilder<T> feature(Feature feature) {
             return this;
         }
 
+        public OwnedServiceBuilder<T> feature(String featureName) {
+            this.name = featureName;
+            return this;
+        }
+
         public OwnedServiceBuilder<T> description(String description) {
             this.description = description;
             return this;

core/runtime/pom.xml

@@ -174,7 +174,7 @@
                         <parentFirstArtifact>org.graalvm.sdk:jniutils</parentFirstArtifact>
                         <parentFirstArtifact>org.graalvm.sdk:word</parentFirstArtifact>
                         <parentFirstArtifact>org.graalvm.sdk:collections</parentFirstArtifact>
-                        <parentFirstArtifact>org.graalvm.sdk:native-bridge</parentFirstArtifact>
+                        <parentFirstArtifact>org.graalvm.sdk:nativebridge</parentFirstArtifact>
                         <!-- /support for GraalVM js -->
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-core</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-development-mode-spi</parentFirstArtifact>

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java

@@ -411,6 +411,16 @@ private boolean classesExist() {
         return false;
     }
 
+    /**
+     * Returns launch mode for the target application model.
+     *
+     * @return launch mode for the target application model
+     */
+    @Internal
+    protected LaunchMode getLaunchMode() {
+        return LaunchMode.DEVELOPMENT;
+    }
+
     private DevModeCommandLine newLauncher(final AnalyticsService analyticsService) throws Exception {
         final Project project = getProject();
         final JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
@@ -466,7 +476,7 @@ private DevModeCommandLine newLauncher(final AnalyticsService analyticsService)
 
         builder.sourceEncoding(getSourceEncoding());
 
-        final ApplicationModel appModel = extension().getApplicationModel(LaunchMode.DEVELOPMENT);
+        final ApplicationModel appModel = extension().getApplicationModel(getLaunchMode());
         builder.extensionDevModeConfig(appModel.getExtensionDevModeConfig())
                 .extensionDevModeJvmOptionFilter(extensionJvmOptions);
 
@@ -538,7 +548,8 @@ private DevModeCommandLine newLauncher(final AnalyticsService analyticsService)
         serializedModel.toFile().deleteOnExit();
         builder.jvmArgs("-D" + BootstrapConstants.SERIALIZED_APP_MODEL + "=" + serializedModel.toAbsolutePath());
 
-        final ApplicationModel testAppModel = extension().getApplicationModel(LaunchMode.TEST);
+        final ApplicationModel testAppModel = getLaunchMode().equals(LaunchMode.TEST) ? appModel
+                : extension().getApplicationModel(LaunchMode.TEST);
         final Path serializedTestModel = ToolingUtils.serializeAppModel(testAppModel, this, true);
         serializedTestModel.toFile().deleteOnExit();
         builder.jvmArgs("-D" + BootstrapConstants.SERIALIZED_TEST_APP_MODEL + "=" + serializedTestModel.toAbsolutePath());

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java

@@ -1,15 +1,14 @@
 package io.quarkus.gradle.tasks;
 
-import java.util.function.Consumer;
-
 import javax.inject.Inject;
 
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.tasks.Internal;
 
 import io.quarkus.deployment.dev.DevModeCommandLineBuilder;
-import io.quarkus.deployment.dev.DevModeContext;
 import io.quarkus.deployment.dev.IsolatedTestModeMain;
 import io.quarkus.gradle.extension.QuarkusPluginExtension;
+import io.quarkus.runtime.LaunchMode;
 
 public abstract class QuarkusTest extends QuarkusDev {
 
@@ -21,12 +20,15 @@ public QuarkusTest(Configuration quarkusDevConfiguration, QuarkusPluginExtension
                 extension);
     }
 
+    @Override
     protected void modifyDevModeContext(DevModeCommandLineBuilder builder) {
-        builder.entryPointCustomizer(new Consumer<DevModeContext>() {
-            @Override
-            public void accept(DevModeContext devModeContext) {
-                devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName());
-            }
-        });
+        builder.entryPointCustomizer(
+                devModeContext -> devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName()));
+    }
+
+    @Override
+    @Internal
+    protected LaunchMode getLaunchMode() {
+        return LaunchMode.TEST;
     }
 }