(camel-k) branch main updated: fix(jvm): enable Quarkus runtime > 3.31

[pcongiusti]

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/main by this push:
     new f96cc0e54 fix(jvm): enable Quarkus runtime > 3.31
f96cc0e54 is described below

commit f96cc0e54db8144f053aa771f5edcb4b68cf7c8d
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Mon Mar 9 16:04:03 2026 +0100

    fix(jvm): enable Quarkus runtime > 3.31
    
    Closes #6498
---
 pkg/apis/camel/v1/integrationkit_types_support.go | 6 +++++-
 pkg/builder/quarkus.go                            | 1 +
 pkg/trait/jvm.go                                  | 4 ++--
 pkg/util/maven/maven_types.go                     | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/apis/camel/v1/integrationkit_types_support.go 
b/pkg/apis/camel/v1/integrationkit_types_support.go
index 6b7314dee..623beb6e5 100644
--- a/pkg/apis/camel/v1/integrationkit_types_support.go
+++ b/pkg/apis/camel/v1/integrationkit_types_support.go
@@ -21,6 +21,7 @@ import (
        "path/filepath"
        "slices"
        "strconv"
+       "strings"
 
        "github.com/apache/camel-k/v2/pkg/util/sets"
        corev1 "k8s.io/api/core/v1"
@@ -212,7 +213,10 @@ func (in *IntegrationKitStatus) GetDependenciesPaths() 
*sets.Set {
        s := sets.NewSet()
        for _, dep := range in.Artifacts {
                path := filepath.Dir(dep.Target)
-               s.Add(path + "/*")
+               // Solves https://github.com/apache/camel-k/issues/6498
+               if !strings.HasSuffix(path, "/quarkus") {
+                       s.Add(path + "/*")
+               }
        }
 
        return s
diff --git a/pkg/builder/quarkus.go b/pkg/builder/quarkus.go
index 0b3c5cb40..00fa75752 100644
--- a/pkg/builder/quarkus.go
+++ b/pkg/builder/quarkus.go
@@ -199,6 +199,7 @@ func generateQuarkusProjectCommon(runtimeProvider 
v1.RuntimeProvider, runtimeVer
                        GroupID:    "io.quarkus",
                        ArtifactID: "quarkus-maven-plugin",
                        Version:    quarkusPlatformVersion,
+                       Extensions: true,
                        Executions: []maven.Execution{
                                {
                                        ID: "build-integration",
diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index 3c2729e8a..987868e3f 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -381,13 +381,13 @@ func (t *jvmTrait) prepareHTTPProxy(container 
*corev1.Container) ([]string, erro
        return args, nil
 }
 
-// Deprecated: to be removed as soon as version 2.3.x is no longer supported.
+// Deprecated: to be removed in v3.x.
 func getLegacyCamelQuarkusDependenciesPaths() *sets.Set {
        s := sets.NewSet()
        s.Add("dependencies/*")
        s.Add("dependencies/lib/boot/*")
        s.Add("dependencies/lib/main/*")
-       s.Add("dependencies/quarkus/*")
+       // s.Add("dependencies/quarkus/*")
 
        return s
 }
diff --git a/pkg/util/maven/maven_types.go b/pkg/util/maven/maven_types.go
index 0f292ce30..76b16c2fd 100644
--- a/pkg/util/maven/maven_types.go
+++ b/pkg/util/maven/maven_types.go
@@ -40,6 +40,7 @@ type Plugin struct {
        GroupID       string                 `xml:"groupId"`
        ArtifactID    string                 `xml:"artifactId"`
        Version       string                 `xml:"version,omitempty"`
+       Extensions    bool                   `xml:"extensions,omitempty"`
        Executions    []Execution            
`xml:"executions>execution,omitempty"`
        Dependencies  []Dependency           
`xml:"dependencies>dependency,omitempty"`
        Configuration v1.PluginConfiguration `xml:"configuration,omitempty"`