Skip to content

Commit f96cc0e

Browse files
committed
fix(jvm): enable Quarkus runtime > 3.31
Closes #6498
1 parent b6fe45f commit f96cc0e

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

pkg/apis/camel/v1/integrationkit_types_support.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"path/filepath"
2222
"slices"
2323
"strconv"
24+
"strings"
2425

2526
"github.com/apache/camel-k/v2/pkg/util/sets"
2627
corev1 "k8s.io/api/core/v1"
@@ -212,7 +213,10 @@ func (in *IntegrationKitStatus) GetDependenciesPaths() *sets.Set {
212213
s := sets.NewSet()
213214
for _, dep := range in.Artifacts {
214215
path := filepath.Dir(dep.Target)
215-
s.Add(path + "/*")
216+
// Solves https://github.com/apache/camel-k/issues/6498
217+
if !strings.HasSuffix(path, "/quarkus") {
218+
s.Add(path + "/*")
219+
}
216220
}
217221

218222
return s

pkg/builder/quarkus.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ func generateQuarkusProjectCommon(runtimeProvider v1.RuntimeProvider, runtimeVer
199199
GroupID: "io.quarkus",
200200
ArtifactID: "quarkus-maven-plugin",
201201
Version: quarkusPlatformVersion,
202+
Extensions: true,
202203
Executions: []maven.Execution{
203204
{
204205
ID: "build-integration",

pkg/trait/jvm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,13 +381,13 @@ func (t *jvmTrait) prepareHTTPProxy(container *corev1.Container) ([]string, erro
381381
return args, nil
382382
}
383383

384-
// Deprecated: to be removed as soon as version 2.3.x is no longer supported.
384+
// Deprecated: to be removed in v3.x.
385385
func getLegacyCamelQuarkusDependenciesPaths() *sets.Set {
386386
s := sets.NewSet()
387387
s.Add("dependencies/*")
388388
s.Add("dependencies/lib/boot/*")
389389
s.Add("dependencies/lib/main/*")
390-
s.Add("dependencies/quarkus/*")
390+
// s.Add("dependencies/quarkus/*")
391391

392392
return s
393393
}

pkg/util/maven/maven_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ type Plugin struct {
4040
GroupID string `xml:"groupId"`
4141
ArtifactID string `xml:"artifactId"`
4242
Version string `xml:"version,omitempty"`
43+
Extensions bool `xml:"extensions,omitempty"`
4344
Executions []Execution `xml:"executions>execution,omitempty"`
4445
Dependencies []Dependency `xml:"dependencies>dependency,omitempty"`
4546
Configuration v1.PluginConfiguration `xml:"configuration,omitempty"`

0 commit comments

Comments
 (0)