You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2025/01/11 08:31:13 UTC
(camel-k) branch main updated: chore: change deprecated quarkus property
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 ca21806ca chore: change deprecated quarkus property
ca21806ca is described below
commit ca21806cafdbb8bd4d48321ca1da7739fa585cd2
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Jan 9 18:14:26 2025 +0100
chore: change deprecated quarkus property
Closes #5987
---
pkg/builder/quarkus.go | 2 +-
pkg/builder/quarkus_test.go | 2 +-
pkg/builder/runtime_support.go | 4 ++--
pkg/trait/quarkus.go | 4 ++--
script/camel-k-runtime-archetype/pom.xml | 2 +-
script/offline_dependencies.sh | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/builder/quarkus.go b/pkg/builder/quarkus.go
index 65a09ac70..2d9b4eb04 100644
--- a/pkg/builder/quarkus.go
+++ b/pkg/builder/quarkus.go
@@ -140,7 +140,7 @@ func generateQuarkusProjectCommon(runtimeProvider v1.RuntimeProvider, runtimeVer
p.Build = &maven.Build{Plugins: make([]maven.Plugin, 0)}
// set fast-jar packaging by default, since it gives some startup time improvements
- p.Properties.Add("quarkus.package.type", "fast-jar")
+ p.Properties.Add("quarkus.package.jar.type", "fast-jar")
// Reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html
p.Properties.Add("project.build.outputTimestamp", time.Now().Format(time.RFC3339))
// DependencyManagement
diff --git a/pkg/builder/quarkus_test.go b/pkg/builder/quarkus_test.go
index 44ddad33e..e079c39ea 100644
--- a/pkg/builder/quarkus_test.go
+++ b/pkg/builder/quarkus_test.go
@@ -41,7 +41,7 @@ func TestGenerateQuarkusProjectCommon(t *testing.T) {
assert.Equal(t, "org.apache.camel.k.integration", p.GroupID)
assert.Equal(t, "camel-k-integration", p.ArtifactID)
assert.Equal(t, defaults.Version, p.Version)
- assert.Equal(t, "fast-jar", p.Properties["quarkus.package.type"])
+ assert.Equal(t, "fast-jar", p.Properties["quarkus.package.jar.type"])
assert.Equal(t, "org.apache.camel.k", p.DependencyManagement.Dependencies[0].GroupID)
assert.Equal(t, "camel-k-runtime-bom", p.DependencyManagement.Dependencies[0].ArtifactID)
assert.Equal(t, "1.2.3", p.DependencyManagement.Dependencies[0].Version)
diff --git a/pkg/builder/runtime_support.go b/pkg/builder/runtime_support.go
index 0fdb6514b..b65b2a9ab 100644
--- a/pkg/builder/runtime_support.go
+++ b/pkg/builder/runtime_support.go
@@ -54,7 +54,7 @@ func (n *NativeSourcesAdapter) TargetDirectory(ctxPath, runner string) string {
// NativeMavenProperty -- .
func (n *NativeSourcesAdapter) NativeMavenProperty() string {
- return "native-sources"
+ return "quarkus.native.sources-only"
}
// NativeAdapter used for Camel Quarkus runtime < 3.5.0.
@@ -64,7 +64,7 @@ type NativeAdapter struct {
// BuildCommands -- .
func (n *NativeAdapter) BuildCommands() string {
// We must override the local repo as it's not shared from the builder container
- return "cd " + n.Directory() + " && ./mvnw $(cat MAVEN_CONTEXT) package -Dquarkus.package.type=native -Dmaven.repo.local=./repo"
+ return "cd " + n.Directory() + " && ./mvnw $(cat MAVEN_CONTEXT) package -Dquarkus.native.enabled=true -Dmaven.repo.local=./repo"
}
// Directory -- .
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index 4cca2e35a..323555074 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -384,7 +384,7 @@ func (t *quarkusTrait) applyWhenBuildSubmitted(e *Environment) error {
//nolint:nestif
if native {
if nativePackageType := builder.QuarkusRuntimeSupport(e.CamelCatalog.GetCamelQuarkusVersion()).NativeMavenProperty(); nativePackageType != "" {
- buildTask.Maven.Properties["quarkus.package.type"] = nativePackageType
+ buildTask.Maven.Properties[nativePackageType] = "true"
if t.NativeBaseImage == "" {
packageTask.BaseImage = QuarkusNativeDefaultBaseImageName
} else {
@@ -400,7 +400,7 @@ func (t *quarkusTrait) applyWhenBuildSubmitted(e *Environment) error {
packageSteps = append(packageSteps, builder.Image.ExecutableDockerfile)
} else {
// Default, if nothing is specified
- buildTask.Maven.Properties["quarkus.package.type"] = string(fastJarPackageType)
+ buildTask.Maven.Properties["quarkus.package.jar.type"] = string(fastJarPackageType)
packageSteps = append(packageSteps, builder.Quarkus.ComputeQuarkusDependencies)
if t.isIncrementalImageBuild(e) {
packageSteps = append(packageSteps, builder.Image.IncrementalImageContext)
diff --git a/script/camel-k-runtime-archetype/pom.xml b/script/camel-k-runtime-archetype/pom.xml
index b1558bdc0..afd76aba8 100644
--- a/script/camel-k-runtime-archetype/pom.xml
+++ b/script/camel-k-runtime-archetype/pom.xml
@@ -22,7 +22,7 @@
<version>2.0.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <quarkus.package.type>fast-jar</quarkus.package.type>
+ <quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
<runtime.version>${RUNTIME_VERSION_CMD}</runtime.version>
<quarkus.version>${QUARKUS_VERSION_CMD}</quarkus.version>
</properties>
diff --git a/script/offline_dependencies.sh b/script/offline_dependencies.sh
index ec0388caf..ca3840eee 100755
--- a/script/offline_dependencies.sh
+++ b/script/offline_dependencies.sh
@@ -148,7 +148,7 @@ cat <<EOF > ${pom}
<version>0.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <quarkus.package.type>fast-jar</quarkus.package.type>
+ <quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
@@ -244,7 +244,7 @@ cat <<EOF > ${pom_min}
<version>0.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <quarkus.package.type>fast-jar</quarkus.package.type>
+ <quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>