Merge pull request #48719 from gsmet/3.24.2-backports-1

[3.24] 3.24.2 backports 1

Author: gsmet

.github/workflows/ci-actions-incremental.yml

@@ -93,7 +93,8 @@ env:
   # This may be a lot better with maven 4, but with maven 3, excluding a project does not exclude its children, and it's not possible to include a project and explicitly exclude some children; compensate by doing excludes the low-tech way, at the shell level
   JVM_TEST_INTEGRATION_TESTS_SELECTOR: "-f integration-tests -pl !gradle -pl !maven -pl !devmode -pl !devtools"
   JVM_TEST_NORMAL_TESTS_SELECTOR: "-pl !docs -Dno-test-modules"
-  PTS_MAVEN_ARGS: "-Ddevelocity.pts.enabled=${{ github.event_name == 'pull_request' && github.base_ref == 'main' && 'true' || 'false' }}"
+  #PTS_MAVEN_ARGS: "-Ddevelocity.pts.enabled=${{ github.event_name == 'pull_request' && github.base_ref == 'main' && 'true' || 'false' }}"
+  PTS_MAVEN_ARGS: ""
   DB_USER: hibernate_orm_test
   DB_PASSWORD: hibernate_orm_test
   DB_NAME: hibernate_orm_test

bom/application/pom.xml

@@ -120,7 +120,7 @@
         <h2.version>2.3.230</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions
                                               and the dependency jts-core needs to be updated in extensions/jdbc/jdbc-h2/runtime/pom.xml -->
         <postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
-        <mariadb-jdbc.version>3.5.3</mariadb-jdbc.version>
+        <mariadb-jdbc.version>3.5.4</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
         <mssql-jdbc.version>12.10.0.jre11</mssql-jdbc.version>
         <adal4j.version>1.6.7</adal4j.version>
@@ -129,15 +129,15 @@
         <db2-jdbc.version>12.1.0.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
-        <junit.jupiter.version>5.13.1</junit.jupiter.version>
-        <infinispan.version>15.0.15.Final</infinispan.version>
+        <junit.jupiter.version>5.13.2</junit.jupiter.version>
+        <infinispan.version>15.0.16.Final</infinispan.version>
         <infinispan.protostream.version>5.0.13.Final</infinispan.protostream.version>
         <caffeine.version>3.2.0</caffeine.version>
         <netty.version>4.1.121.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>
-        <mutiny.version>2.9.0</mutiny.version>
+        <mutiny.version>2.9.2</mutiny.version>
         <jctools-core.version>4.0.5</jctools-core.version>
         <kafka3.version>4.0.0</kafka3.version>
         <lz4.version>1.8.0</lz4.version> <!-- dependency of the kafka-clients that could be overridden by other imported BOMs in the platform -->
@@ -196,7 +196,7 @@
         <avro.version>1.12.0</avro.version>
         <apicurio-registry.version>2.6.12.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.21.2</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
+        <testcontainers.version>1.21.3</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.2</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->
         <!-- Check the compatibility matrix (https://github.com/opensearch-project/opensearch-testcontainers) before upgrading: -->
         <opensearch-testcontainers.version>2.0.2</opensearch-testcontainers.version>

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

@@ -673,14 +673,13 @@ public Set<String> syncState(Map<String, String> fileHashes) {
                     //we have some filters, for files that we don't want to delete
                     continue;
                 }
-                log.info("Scheduled for removal " + file);
                 if (removedFiles.isEmpty()) {
                     removedFiles = new ArrayList<>();
                 }
                 removedFiles.add(applicationRoot.resolve(file));
             }
             if (!removedFiles.isEmpty()) {
-                DevModeMediator.removedFiles.addLast(removedFiles);
+                DevModeMediator.scheduleDelete(removedFiles);
             }
             return ret;
         } catch (IOException e) {
@@ -727,12 +726,11 @@ ClassScanResult checkForChangedClasses(QuarkusCompiler compiler,
             final List<Path> moduleChangedSourceFilePaths = new ArrayList<>();
 
             for (Path sourcePath : cuf.apply(module).getSourcePaths()) {
-                final Set<File> changedSourceFiles;
-                Path start = sourcePath;
-                if (!Files.exists(start)) {
+                if (!Files.exists(sourcePath)) {
                     continue;
                 }
-                try (final Stream<Path> sourcesStream = Files.walk(start)) {
+                final Set<File> changedSourceFiles;
+                try (final Stream<Path> sourcesStream = Files.walk(sourcePath)) {
                     changedSourceFiles = sourcesStream
                             .parallel()
                             .filter(p -> matchingHandledExtension(p).isPresent()

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java

@@ -920,7 +920,10 @@ private void copyDependency(Set<ArtifactKey> parentFirstArtifacts, OutputTargetB
             return;
         }
         for (Path resolvedDep : appDep.getResolvedPaths()) {
-            final String fileName = appDep.getGroupId() + "." + resolvedDep.getFileName();
+            final boolean isDirectory = Files.isDirectory(resolvedDep);
+            // we don't use getFileName() for directories, since directories would often be "classes" ending up merging content from multiple dependencies in the same package
+            final String fileName = isDirectory ? getFileNameForDirectory(appDep)
+                    : appDep.getGroupId() + "." + resolvedDep.getFileName();
             final Path targetPath;
 
             if (allowParentFirst && parentFirstArtifacts.contains(appDep.getKey())) {
@@ -932,7 +935,7 @@ private void copyDependency(Set<ArtifactKey> parentFirstArtifacts, OutputTargetB
             }
             runtimeArtifacts.computeIfAbsent(appDep.getKey(), (s) -> new ArrayList<>(1)).add(targetPath);
 
-            if (Files.isDirectory(resolvedDep)) {
+            if (isDirectory) {
                 // This case can happen when we are building a jar from inside the Quarkus repository
                 // and Quarkus Bootstrap's localProjectDiscovery has been set to true. In such a case
                 // the non-jar dependencies are the Quarkus dependencies picked up on the file system
@@ -972,6 +975,21 @@ private void copyDependency(Set<ArtifactKey> parentFirstArtifacts, OutputTargetB
         }
     }
 
+    /**
+     * Returns a JAR file name to be used for a content of a dependency that is in a directory.
+     *
+     * @param dep dependency
+     * @return JAR file name
+     */
+    private static String getFileNameForDirectory(ResolvedDependency dep) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(dep.getGroupId()).append(".").append(dep.getArtifactId()).append("-");
+        if (!dep.getClassifier().isEmpty()) {
+            sb.append(dep.getClassifier()).append("-");
+        }
+        return sb.append(dep.getVersion()).append(".").append(dep.getType()).toString();
+    }
+
     private void packageClasses(Path resolvedDep, final Path targetPath, PackageConfig packageConfig) throws IOException {
         try (FileSystem runnerZipFs = createNewZip(targetPath, packageConfig)) {
             Files.walkFileTree(resolvedDep, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE,

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

@@ -9,7 +9,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -462,7 +461,7 @@ public boolean isSatisfiedBy(Task t) {
                     });
 
                     tasks.withType(Test.class).configureEach(t -> {
-                        t.setSystemProperties(extractQuarkusTestSystemProperties());
+                        t.setSystemProperties(extractQuarkusTestSystemProperties(project));
 
                         t.getInputs().files(quarkusGenerateTestAppModelTask);
                         // Quarkus test configuration action which should be executed before any Quarkus test
@@ -661,11 +660,12 @@ private void setupQuarkusBuildTaskDeps(Project project, Project dep, Set<String>
                                 .ifPresent(quarkusTask -> quarkusTask.configure(t -> t.dependsOn(jarTask)));
                     }
                 });
-
         getLazyTask(project, QUARKUS_DEV_TASK_NAME).ifPresent(quarkusDev -> {
             getLazyTask(project, JavaPlugin.PROCESS_RESOURCES_TASK_NAME)
                     .ifPresent(t -> quarkusDev.configure(qd -> qd.dependsOn(t)));
-            addDependencyOnJandexIfConfigured(dep, quarkusDev);
+            if (project.getRootProject().equals(dep.getRootProject())) {
+                addDependencyOnJandexIfConfigured(dep, quarkusDev);
+            }
         });
 
         visitProjectDependencies(project, dep, visited);
@@ -731,16 +731,9 @@ private Optional<TaskProvider<Task>> getLazyTask(Project project, String name) {
         }
     }
 
-    private static Map<String, Object> extractQuarkusTestSystemProperties() {
-        Properties systemProperties = System.getProperties();
-        Map<String, Object> quarkusSystemProperties = new HashMap<>();
-        for (String propertyName : systemProperties.stringPropertyNames()) {
-            if (!propertyName.startsWith("quarkus.test.")) {
-                continue;
-            }
-
-            quarkusSystemProperties.put(propertyName, systemProperties.get(propertyName));
-        }
-        return quarkusSystemProperties;
+    private static Map<String, Object> extractQuarkusTestSystemProperties(Project project) {
+        return new HashMap<>(project.getProviders()
+                .systemPropertiesPrefixedBy("quarkus.test.")
+                .get());
     }
 }

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java

@@ -178,9 +178,15 @@ private Configuration createConditionalDependenciesConfiguration(Project project
         // on conditional dependencies (https://github.com/gradle/gradle/issues/6881)
         // However, if we use a named configuration we run into issues preventing IDEs to import projects
         // (https://github.com/quarkusio/quarkus/issues/41825) and ./gradlew refreshVersions seems to break as well.
-        Configuration conditionalDepConfiguration = project.getConfigurations()
-                .detachedConfiguration()
-                .extendsFrom(enforcedPlatforms);
+        Configuration conditionalDepConfiguration = project.getConfigurations().detachedConfiguration();
+        enforcedPlatforms.getExcludeRules().forEach(rule -> {
+            conditionalDepConfiguration.exclude(Map.of(
+                    "group", rule.getGroup(),
+                    "module", rule.getModule()));
+        });
+        enforcedPlatforms.getAllDependencies().forEach(dependency -> {
+            conditionalDepConfiguration.getDependencies().add(dependency);
+        });
         conditionalDepConfiguration.getDependencies().add(conditionalDep);
         return conditionalDepConfiguration;
     }

devtools/gradle/gradle/libs.versions.toml

@@ -5,7 +5,7 @@ plugin-publish = "1.3.1"
 kotlin = "2.0.21"
 smallrye-config = "3.13.2"
 
-junit5 = "5.13.1"
+junit5 = "5.13.2"
 assertj = "3.27.3"
 
 [plugins]

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

@@ -825,9 +825,9 @@ private String handleAutoCompile(List<String> reloadPoms) throws MojoExecutionEx
      * @param reloadPoms POM files to be reloaded from disk instead of taken from the reactor
      * @return map of parameters for the Quarkus plugin goals
      */
-    private static Map<String, String> getQuarkusGoalParams(String bootstrapId, List<String> reloadPoms) {
+    private Map<String, String> getQuarkusGoalParams(String bootstrapId, List<String> reloadPoms) {
         final Map<String, String> result = new HashMap<>(4);
-        result.put(QuarkusBootstrapMojo.MODE_PARAM, LaunchMode.DEVELOPMENT.name());
+        result.put(QuarkusBootstrapMojo.MODE_PARAM, getLaunchModeClasspath().name());
         result.put(QuarkusBootstrapMojo.CLOSE_BOOTSTRAPPED_APP_PARAM, "false");
         result.put(QuarkusBootstrapMojo.BOOTSTRAP_ID_PARAM, bootstrapId);
         if (reloadPoms != null && !reloadPoms.isEmpty()) {
@@ -1524,7 +1524,7 @@ private DevModeCommandLine newLauncher(String actualDebugPort, String bootstrapI
             // the Maven resolver will be checking for newer snapshots in the remote repository and might end up resolving the artifact from there.
             final BootstrapMavenContext mvnCtx = workspaceProvider.createMavenContext(mvnConfig);
             appModel = new BootstrapAppModelResolver(new MavenArtifactResolver(mvnCtx))
-                    .setDevMode(true)
+                    .setDevMode(getLaunchModeClasspath().isDevOrTest())
                     .setTest(LaunchMode.TEST.equals(getLaunchModeClasspath()))
                     .setCollectReloadableDependencies(!noDeps)
                     .setLegacyModelResolver(BootstrapAppModelResolver.isLegacyModelResolver(project.getProperties()))

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

@@ -4,7 +4,9 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
+import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.deployment.dev.DevModeCommandLineBuilder;
+import io.quarkus.runtime.LaunchMode;
 
 /**
  * The dev mojo, that connects to a remote host.
@@ -15,4 +17,12 @@ public class RemoteDevMojo extends DevMojo {
     protected void modifyDevModeContext(DevModeCommandLineBuilder builder) {
         builder.remoteDev(true);
     }
+
+    @Override
+    protected LaunchMode getLaunchModeClasspath() {
+        // For remote-dev we should match the dependency model on the service side, which is a production mutable-jar,
+        // so we return LaunchMode.NORMAL, but we need to enable workspace discovery to be able to watch for source code changes
+        project.getProperties().putIfAbsent(BootstrapConstants.QUARKUS_BOOTSTRAP_WORKSPACE_DISCOVERY, "true");
+        return LaunchMode.NORMAL;
+    }
 }

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/codestart.yml

@@ -5,7 +5,7 @@ tags: example
 metadata:
   title: Amazon Lambda Integration example
   description: This example contains a Quarkus Greeting Lambda ready for Amazon.
-  related-guide-section: https://quarkus.io/guides/amazon-lambda
+  related-guide-section: https://quarkus.io/guides/aws-lambda
 language:
   base:
     dependencies: