This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 51916da9b56 camel-jbang - export to quarkus - allow to configure
quarkus platform GAV
51916da9b56 is described below
commit 51916da9b566edacad648cf0692e85ad36433ead
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jun 22 08:22:13 2022 +0200
camel-jbang - export to quarkus - allow to configure quarkus platform GAV
---
.../java/org/apache/camel/dsl/jbang/core/commands/Export.java | 4 ++++
.../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 10 +++++++++-
.../apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 2 ++
.../src/main/resources/templates/quarkus-pom.tmpl | 6 +++---
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 6c489739ccc..8f420784e6a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -46,6 +46,8 @@ class Export extends ExportBaseCommand {
// allow configuring versions from profile
this.javaVersion = prop.getProperty("camel.jbang.javaVersion",
this.javaVersion);
this.kameletsVersion =
prop.getProperty("camel.jbang.kameletsVersion", this.kameletsVersion);
+ this.quarkusGroupId =
prop.getProperty("camel.jbang.quarkusGroupId", this.quarkusGroupId);
+ this.quarkusArtifactId =
prop.getProperty("camel.jbang.quarkusArtifactId", this.quarkusArtifactId);
this.quarkusVersion =
prop.getProperty("camel.jbang.quarkusVersion", this.quarkusVersion);
this.springBootVersion =
prop.getProperty("camel.jbang.springBootVersion", this.springBootVersion);
}
@@ -82,6 +84,8 @@ class Export extends ExportBaseCommand {
cmd.logging = this.logging;
cmd.loggingLevel = this.loggingLevel;
cmd.mainClassname = this.mainClassname;
+ cmd.quarkusGroupId = this.quarkusGroupId;
+ cmd.quarkusArtifactId = this.quarkusArtifactId;
cmd.quarkusVersion = this.quarkusVersion;
cmd.springBootVersion = this.springBootVersion;
cmd.mavenWrapper = this.mavenWrapper;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index b808a396e28..a55ba670c80 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -78,7 +78,15 @@ abstract class ExportBaseCommand extends CamelCommand {
defaultValue = "2.7.0")
protected String springBootVersion;
- @CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus version",
+ @CommandLine.Option(names = { "--quarkus-group-id" }, description =
"Quarkus Platform Maven groupId",
+ defaultValue = "io.quarkus.platform")
+ protected String quarkusGroupId;
+
+ @CommandLine.Option(names = { "--quarkus-artifact-id" }, description =
"Quarkus Platform Maven artifactId",
+ defaultValue = "quarkus-bom")
+ protected String quarkusArtifactId;
+
+ @CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
defaultValue = "2.9.2.Final")
protected String quarkusVersion;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index bc25d769db8..0aa570ab99f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -158,6 +158,8 @@ class ExportQuarkus extends Export {
context = context.replaceFirst("\\{\\{ \\.GroupId }}", ids[0]);
context = context.replaceFirst("\\{\\{ \\.ArtifactId }}", ids[1]);
context = context.replaceFirst("\\{\\{ \\.Version }}", ids[2]);
+ context = context.replaceFirst("\\{\\{ \\.QuarkusGroupId }}",
quarkusGroupId);
+ context = context.replaceFirst("\\{\\{ \\.QuarkusArtifactId }}",
quarkusArtifactId);
context = context.replaceAll("\\{\\{ \\.QuarkusVersion }}",
quarkusVersion);
context = context.replaceFirst("\\{\\{ \\.JavaVersion }}",
javaVersion);
context = context.replaceFirst("\\{\\{ \\.CamelVersion }}",
camelVersion);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
index f85db0bf222..46728c8107a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
@@ -9,13 +9,13 @@
<version>{{ .Version }}</version>
<properties>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
+ <compiler-plugin.version>3.10.1</compiler-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<maven.compiler.release>{{ .JavaVersion }}</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+ <quarkus.platform.group-id>{{ .QuarkusGroupId
}}</quarkus.platform.group-id>
+ <quarkus.platform.artifact-id>{{ .QuarkusArtifactId
}}</quarkus.platform.artifact-id>
<quarkus.platform.version>{{ .QuarkusVersion
}}</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
</properties>
