Merge pull request #1581 from gsmet/quarkus-3.26.1

Upgrade to Quarkus 3.26.1

Author: gsmet

generated-platform-project/quarkus-camel/bom/pom.xml

@@ -1174,7 +1174,7 @@
       <dependency>
         <groupId>jakarta.mail</groupId>
         <artifactId>jakarta.mail-api</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.4</version>
       </dependency>
       <dependency>
         <groupId>jakarta.xml.soap</groupId>

generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-cxf-soap-grouped/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>io.quarkiverse.cxf</groupId>
       <artifactId>quarkus-cxf-test-util</artifactId>
-      <version>3.26.0</version>
+      <version>${camel-quarkus.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

generated-platform-project/quarkus-cxf/bom/pom.xml

@@ -234,7 +234,7 @@
       <dependency>
         <groupId>jakarta.mail</groupId>
         <artifactId>jakarta.mail-api</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.4</version>
       </dependency>
       <dependency>
         <groupId>jakarta.xml.soap</groupId>

generated-platform-project/quarkus-maven-plugin/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());

generated-platform-project/quarkus-maven-plugin/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) {