Skip to content

Commit 3c0c67d

Browse files
committed
chore: change deprecated quarkus property
Closes #5987
1 parent c6fc6af commit 3c0c67d

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

pkg/builder/quarkus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func generateQuarkusProjectCommon(runtimeProvider v1.RuntimeProvider, runtimeVer
140140
p.Build = &maven.Build{Plugins: make([]maven.Plugin, 0)}
141141

142142
// set fast-jar packaging by default, since it gives some startup time improvements
143-
p.Properties.Add("quarkus.package.type", "fast-jar")
143+
p.Properties.Add("quarkus.package.jar.type", "fast-jar")
144144
// Reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html
145145
p.Properties.Add("project.build.outputTimestamp", time.Now().Format(time.RFC3339))
146146
// DependencyManagement

pkg/builder/quarkus_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestGenerateQuarkusProjectCommon(t *testing.T) {
4141
assert.Equal(t, "org.apache.camel.k.integration", p.GroupID)
4242
assert.Equal(t, "camel-k-integration", p.ArtifactID)
4343
assert.Equal(t, defaults.Version, p.Version)
44-
assert.Equal(t, "fast-jar", p.Properties["quarkus.package.type"])
44+
assert.Equal(t, "fast-jar", p.Properties["quarkus.package.jar.type"])
4545
assert.Equal(t, "org.apache.camel.k", p.DependencyManagement.Dependencies[0].GroupID)
4646
assert.Equal(t, "camel-k-runtime-bom", p.DependencyManagement.Dependencies[0].ArtifactID)
4747
assert.Equal(t, "1.2.3", p.DependencyManagement.Dependencies[0].Version)

pkg/builder/runtime_support.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (n *NativeSourcesAdapter) TargetDirectory(ctxPath, runner string) string {
5454

5555
// NativeMavenProperty -- .
5656
func (n *NativeSourcesAdapter) NativeMavenProperty() string {
57-
return "native-sources"
57+
return "quarkus.native.sources-only"
5858
}
5959

6060
// NativeAdapter used for Camel Quarkus runtime < 3.5.0.
@@ -64,7 +64,7 @@ type NativeAdapter struct {
6464
// BuildCommands -- .
6565
func (n *NativeAdapter) BuildCommands() string {
6666
// We must override the local repo as it's not shared from the builder container
67-
return "cd " + n.Directory() + " && ./mvnw $(cat MAVEN_CONTEXT) package -Dquarkus.package.type=native -Dmaven.repo.local=./repo"
67+
return "cd " + n.Directory() + " && ./mvnw $(cat MAVEN_CONTEXT) package -Dquarkus.native.enabled=true -Dmaven.repo.local=./repo"
6868
}
6969

7070
// Directory -- .

pkg/trait/quarkus.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ func (t *quarkusTrait) applyWhenBuildSubmitted(e *Environment) error {
384384
//nolint:nestif
385385
if native {
386386
if nativePackageType := builder.QuarkusRuntimeSupport(e.CamelCatalog.GetCamelQuarkusVersion()).NativeMavenProperty(); nativePackageType != "" {
387-
buildTask.Maven.Properties["quarkus.package.type"] = nativePackageType
387+
buildTask.Maven.Properties[nativePackageType] = "true"
388388
if t.NativeBaseImage == "" {
389389
packageTask.BaseImage = QuarkusNativeDefaultBaseImageName
390390
} else {
@@ -400,7 +400,7 @@ func (t *quarkusTrait) applyWhenBuildSubmitted(e *Environment) error {
400400
packageSteps = append(packageSteps, builder.Image.ExecutableDockerfile)
401401
} else {
402402
// Default, if nothing is specified
403-
buildTask.Maven.Properties["quarkus.package.type"] = string(fastJarPackageType)
403+
buildTask.Maven.Properties["quarkus.package.jar.type"] = string(fastJarPackageType)
404404
packageSteps = append(packageSteps, builder.Quarkus.ComputeQuarkusDependencies)
405405
if t.isIncrementalImageBuild(e) {
406406
packageSteps = append(packageSteps, builder.Image.IncrementalImageContext)

script/camel-k-runtime-archetype/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<version>2.0.0</version>
2323
<properties>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25-
<quarkus.package.type>fast-jar</quarkus.package.type>
25+
<quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
2626
<runtime.version>${RUNTIME_VERSION_CMD}</runtime.version>
2727
<quarkus.version>${QUARKUS_VERSION_CMD}</quarkus.version>
2828
</properties>

script/offline_dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ cat <<EOF > ${pom}
148148
<version>0.1</version>
149149
<properties>
150150
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
151-
<quarkus.package.type>fast-jar</quarkus.package.type>
151+
<quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
152152
<maven.compiler.release>17</maven.compiler.release>
153153
<maven.compiler.source>17</maven.compiler.source>
154154
<maven.compiler.target>17</maven.compiler.target>
@@ -244,7 +244,7 @@ cat <<EOF > ${pom_min}
244244
<version>0.1</version>
245245
<properties>
246246
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
247-
<quarkus.package.type>fast-jar</quarkus.package.type>
247+
<quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
248248
<maven.compiler.release>17</maven.compiler.release>
249249
<maven.compiler.source>17</maven.compiler.source>
250250
<maven.compiler.target>17</maven.compiler.target>

0 commit comments

Comments
 (0)