Merge pull request #49737 from gsmet/3.26.1-backports-1

[3.26] 3.26.1 backports 1

Author: gsmet

bom/application/pom.xml

@@ -70,7 +70,7 @@
         <jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>
         <jakarta.json-api.version>2.1.3</jakarta.json-api.version>
         <jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
-        <jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
+        <jakarta.mail-api.version>2.1.4</jakarta.mail-api.version>
         <!--jakarta.persistence-api.version is located in the root pom -->
         <jakarta.data-api.version>1.0.1</jakarta.data-api.version>
         <jakarta.resource-api.version>2.1.0</jakarta.resource-api.version>
@@ -112,7 +112,7 @@
         <wildfly-elytron.version>2.6.4.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.18</vertx.version>
+        <vertx.version>4.5.20</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpasync.version>4.1.5</httpasync.version>
@@ -160,7 +160,7 @@
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.3.0</awaitility.version>
         <jboss-logmanager.version>3.1.2.Final</jboss-logmanager.version>
-        <flyway.version>11.11.1</flyway.version>
+        <flyway.version>11.11.2</flyway.version>
         <yasson.version>3.0.4</yasson.version>
         <!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
         <liquibase.version>4.33.0</liquibase.version>

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

@@ -1512,6 +1512,7 @@ private static class IsEntryIgnoredForUberJarPredicate implements Predicate<Stri
                 "META-INF/jandex.idx",
                 "META-INF/panache-archive.marker", // deprecated and unused, but still present in some archives
                 "META-INF/build.metadata", // present in the Red Hat Build of Quarkus
+                "META-INF/quarkus-config-doc/quarkus-config-javadoc.json",
                 "LICENSE");
 
         @Override

core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java

@@ -34,10 +34,26 @@ public static SmallRyeConfigBuilder emptyConfigBuilder() {
                 .addDefaultSources();
     }
 
+    /**
+     * Returns a {@code List} of the active profiles in Quarkus.
+     * <p>
+     * Profiles are sorted in reverse order according to how they were set in
+     * {@code quarkus.profile}, as the last profile overrides the previous one until there are
+     * no profiles left in the list.
+     *
+     * @return a {@code List} of the active profiles
+     * @see io.smallrye.config.SmallRyeConfig#getProfiles()
+     */
     public static List<String> getProfiles() {
         return ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getProfiles();
     }
 
+    /**
+     * Check if a configuration profile is active in Quarkus.
+     *
+     * @param profile the configuration profile to check
+     * @return true if the profile is active or false otherwise.
+     */
     public static boolean isProfileActive(final String profile) {
         return getProfiles().contains(profile);
     }

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

@@ -26,7 +26,6 @@
 import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.CodestartResourceLoadersBuilder;
-import io.quarkus.devtools.project.JavaVersion;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.buildfile.MavenProjectBuildFile;
@@ -59,13 +58,13 @@ public abstract class QuarkusProjectMojoBase extends AbstractMojo {
     protected List<RemoteRepository> repos;
 
     @Parameter(property = "bomGroupId", required = false)
-    private String bomGroupId;
+    String bomGroupId;
 
     @Parameter(property = "bomArtifactId", required = false)
-    private String bomArtifactId;
+    String bomArtifactId;
 
     @Parameter(property = "bomVersion", required = false)
-    private String bomVersion;
+    String bomVersion;
 
     @Component
     QuarkusWorkspaceProvider workspaceProvider;
@@ -91,7 +90,7 @@ public void execute() throws MojoExecutionException {
         }
 
         final QuarkusProject quarkusProject;
-        if (BuildTool.MAVEN.equals(buildTool) && project.getFile() != null) {
+        if (BuildTool.MAVEN.equals(buildTool) && project.getFile() != null && bomVersion == null) {
             try {
                 quarkusProject = MavenProjectBuildFile.getProject(projectArtifact(), project.getOriginalModel(), baseDir(),
                         project.getModel().getProperties(), artifactResolver(), getExtensionCatalogResolver(),
@@ -108,7 +107,8 @@ public void execute() throws MojoExecutionException {
                     .catalog(extensionCatalog)
                     .build();
             quarkusProject = QuarkusProject.of(baseDir(), extensionCatalog,
-                    codestartsResourceLoader, log, buildTool, JavaVersion.NA);
+                    codestartsResourceLoader, log, buildTool,
+                    MavenProjectBuildFile.resolveJavaVersion(project.getModel().getProperties()));
         }
 
         doExecute(quarkusProject, getMessageWriter());

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

@@ -2,10 +2,7 @@
 
 import java.util.List;
 
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
@@ -16,6 +13,7 @@
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateExitErrorException;
 import io.quarkus.maven.dependency.ArtifactCoords;
+import io.quarkus.platform.tools.ToolsConstants;
 import io.quarkus.registry.RegistryResolutionException;
 import io.quarkus.registry.catalog.ExtensionCatalog;
 import io.quarkus.registry.catalog.PlatformStreamCoords;
@@ -87,12 +85,6 @@ public class UpdateMojo extends QuarkusProjectStateMojoBase {
     @Parameter(property = "stream", required = false)
     private String stream;
 
-    @Parameter(defaultValue = "${session}", readonly = true)
-    private MavenSession mavenSession;
-
-    @Component
-    private BuildPluginManager pluginManager;
-
     @Override
     protected void validateParameters() throws MojoExecutionException {
         getLog().warn("quarkus:update goal is experimental, its options and output might change in future versions");
@@ -114,7 +106,14 @@ protected void processProjectState(QuarkusProject quarkusProject) throws MojoExe
                 targetCatalog = getExtensionCatalogResolver().resolveExtensionCatalog(platformStream);
                 platformVersion = getPrimaryBom(targetCatalog).getVersion();
             } else {
-                targetCatalog = getExtensionCatalogResolver().resolveExtensionCatalog();
+                if (bomVersion != null) {
+                    targetCatalog = getExtensionCatalogResolver().resolveExtensionCatalog(List.of(ArtifactCoords.pom(
+                            this.bomGroupId == null ? ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID : this.bomGroupId,
+                            this.bomArtifactId == null ? ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID : this.bomArtifactId,
+                            bomVersion)));
+                } else {
+                    targetCatalog = getExtensionCatalogResolver().resolveExtensionCatalog();
+                }
                 platformVersion = getPrimaryBom(targetCatalog).getVersion();
             }
         } catch (RegistryResolutionException e) {

docs/src/main/asciidoc/compose-dev-services.adoc

@@ -645,6 +645,8 @@ Compose Dev Services won't try to discover any services and will be disabled.
 === Compose Dev Services used for tests
 
 For Quarkus tests, a generated project name in the format `quarkus-devservices-<application-name>-<random-suffix>` is used by default to ensure isolation between test runs and running dev mode services.
+If the top-level name attribute is specified in the Compose file, the project name in the format `<compose-name>-<random-suffix>` is used.
+
 This way, Quarkus tests start a separate copy of the services defined in the compose files.
 For example, when running continuous testing in development mode, tests will have their own isolated set of services.
 

docs/src/main/asciidoc/config-reference.adoc

@@ -367,7 +367,7 @@ Setting `quarkus.profile`  to `staging` will activate the `staging` profile.
 
 [NOTE]
 ====
-The `io.smallrye.config.SmallRyeConfig#getProfiles` API provides a way to retrieve the active profiles programmatically.
+The `io.quarkus.runtime.configuration.ConfigUtils.getProfiles` API provides a way to retrieve the active profiles programmatically.
 ====
 
 === Profile-aware files

docs/src/main/asciidoc/datasource.adoc

@@ -678,9 +678,15 @@ You can override this by setting the `transactions` configuration property:
 * `quarkus.datasource.jdbc.transactions` for default unnamed datasource
 * `quarkus.datasource._<datasource-name>_.jdbc.transactions` for named datasource
 
-When a datasource is enabled for XA (by setting `quarkus.datasource[.optional name].jdbc.transactions` to `xa`) and the transaction recovery system is enabled (by setting the property `quarkus.transaction-manager.enable-recovery` to `true`), then the datasource is automatically registered for recovery.
-This is a safe default, but you can override this behaviour on a per-datasource basis by setting `quarkus.datasource.jdbc.enable-recovery` or `quarkus.datasource."datasource-name".jdbc.enable-recovery` to `false`.
-Use only for advanced use cases and if you know recovery will not be necessary; otherwise it can result in data loss, data unavailability, or both, because resources can become locked indefinitely.
+When a datasource is configured for XA transactions by setting `quarkus.datasource[.optional name].jdbc.transactions=xa` and the transaction recovery system is enabled by using `quarkus.transaction-manager.enable-recovery=true`, the datasource is automatically registered for recovery.
+This is the preferred and safe default.
+You can override this behavior for individual datasources by setting `quarkus.datasource.jdbc.enable-recovery=false` or `quarkus.datasource."datasource-name".jdbc.enable-recovery=false`.
+
+[IMPORTANT]
+====
+Change this setting only in advanced use cases and only if you are certain recovery is not required.
+Incorrect configuration can lead to data loss, data unavailability, or both, due to resources remaining locked indefinitely.
+====
 
 For more information, see the <<configuration-reference,Configuration reference>> section below.
 To facilitate the storage of transaction logs in a database by using JDBC, see the xref:transaction.adoc#jdbcstore[Configuring transaction logs to be stored in a datasource] section of the xref:transaction.adoc[Using transactions in Quarkus] guide.

docs/src/main/asciidoc/dev-ui.adoc

@@ -397,7 +397,7 @@ To add a tab to the Dev UI settings dialog, produce a `SettingPageBuildItem`:
     @BuildStep(onlyIf = IsLocalDevelopment.class) // <1>
     void createMCPSettingsTab(BuildProducer<SettingPageBuildItem> settingPageProducer) {
 
-        SettingPageBuildItem mcpSettingTab = new SettingPageBuildItem("Dev MCP");// <2>
+        SettingPageBuildItem mcpSettingTab = new SettingPageBuildItem();// <2>
 
         mcpSettingTab.addPage(Page.webComponentPageBuilder() // <3>
                 .title("Dev MCP")// <4>
@@ -438,7 +438,7 @@ To do this, produce a `UnlistedPageBuildItem`:
     @BuildStep(onlyIf = IsLocalDevelopment.class) // <1>
     void createMCPUnlistedPages(BuildProducer<UnlistedPageBuildItem> unlistedPageProducer) {
 
-        UnlistedPageBuildItem mcpOtherPages = new UnlistedPageBuildItem("Dev MCP"); // <2>
+        UnlistedPageBuildItem mcpOtherPages = new UnlistedPageBuildItem(); // <2>
 
         mcpOtherPages.addPage(Page.webComponentPageBuilder() // <3>
                 .title("Tools") // <4>

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

@@ -486,6 +486,13 @@ EntityManager entityManager;
 ----
 <1> Here again, we use the same `@io.quarkus.hibernate.orm.PersistenceUnit` annotation.
 
+[NOTE]
+====
+The injected `EntityManager` or `Session` instance is a proxy that requires an active transaction for interaction.
+
+By default it is also possible to use it for read-only operations without a transaction when in a request scope, but this can be disabled by setting `quarkus.hibernate-orm.request-scoped.enabled` to `false`.
+====
+
 You can inject the `EntityManagerFactory` of a named persistence unit using the exact same mechanism:
 
 [source,java]