You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/21 05:02:51 UTC
[camel] 01/02: CAMEL-19121: camel-jbang - Adapt to Camel v4
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
commit c60c480b2e20fab514db2483637bf85d5814d086
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 21 06:29:43 2023 +0200
CAMEL-19121: camel-jbang - Adapt to Camel v4
---
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 8 ++++----
.../main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
.../dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +-
.../camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java | 2 +-
.../src/main/resources/templates/quarkus-gradle-properties.tmpl | 1 -
.../src/main/resources/templates/run-custom-camel-version.tmpl | 2 +-
.../src/main/resources/templates/spring-boot-build-gradle.tmpl | 9 ++++++---
9 files changed, 16 insertions(+), 14 deletions(-)
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 4a066fbd2b8..40a2b3ad0dc 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
@@ -101,7 +101,7 @@ abstract class ExportBaseCommand extends CamelCommand {
defaultValue = "CamelApplication")
protected String mainClassname;
- @CommandLine.Option(names = { "--java-version" }, description = "Java version (11 or 17)", defaultValue = "11")
+ @CommandLine.Option(names = { "--java-version" }, description = "Java version", defaultValue = "17")
protected String javaVersion;
@CommandLine.Option(names = { "--camel-version" },
@@ -109,7 +109,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String camelVersion;
@CommandLine.Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.5")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "4.0.0-RC1")
protected String kameletsVersion;
@CommandLine.Option(names = { "--local-kamelet-dir" },
@@ -117,7 +117,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String localKameletDir;
@CommandLine.Option(names = { "--spring-boot-version" }, description = "Spring Boot version",
- defaultValue = "2.7.10")
+ defaultValue = "3.1.2")
protected String springBootVersion;
@CommandLine.Option(names = { "--camel-spring-boot-version" }, description = "Camel version to use with Spring Boot")
@@ -132,7 +132,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId;
@CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version",
- defaultValue = "2.16.7.Final")
+ defaultValue = "3.2.1.Final")
protected String quarkusVersion;
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index ce33d368dd5..92c33c4bc6d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -59,7 +59,7 @@ public class Init extends CamelCommand {
private String fromKamelet;
@Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.5")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "4.0.0-RC1")
private String kameletsVersion;
@Option(names = {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 54d74ab2f5e..a6d37957bb5 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -729,7 +729,7 @@ public class Run extends CamelCommand {
String content = IOHelper.loadText(is);
IOHelper.close(is);
- content = content.replaceFirst("\\{\\{ \\.JavaVersion }}", "17"); // TODO: java 11 or 17
+ content = content.replaceFirst("\\{\\{ \\.JavaVersion }}", "17");
if (repos != null) {
content = content.replaceFirst("\\{\\{ \\.MavenRepositories }}", "//REPOS " + repos);
} else {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index a4b458861ee..93755c003f4 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -48,7 +48,7 @@ public abstract class CatalogBaseCommand extends CamelCommand {
String runtime;
@CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version",
- defaultValue = "2.16.7.Final")
+ defaultValue = "3.2.1.Final")
String quarkusVersion;
@CommandLine.Option(names = { "--repos" },
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index ff016ad047f..2df991a4732 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -86,7 +86,7 @@ public class CatalogDoc extends CamelCommand {
boolean headers;
@CommandLine.Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.5")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "4.0.0-RC1")
String kameletsVersion;
CamelCatalog catalog;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index 7f95d750887..576a4c9c03f 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -52,7 +52,7 @@ public class CatalogKamelet extends CamelCommand {
String filterName;
@CommandLine.Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.5")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "4.0.0-RC1")
String kameletsVersion;
public CatalogKamelet(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-gradle-properties.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-gradle-properties.tmpl
index 4beeb36b68b..75c914f229d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-gradle-properties.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-gradle-properties.tmpl
@@ -1,4 +1,3 @@
-gradle.properties
#Gradle properties
quarkusPluginId=io.quarkus
quarkusPluginVersion={{ .QuarkusVersion }}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/run-custom-camel-version.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/run-custom-camel-version.tmpl
index 930a243b571..c707abfb58c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/run-custom-camel-version.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/run-custom-camel-version.tmpl
@@ -22,7 +22,7 @@
//REPOS central=https://repo1.maven.org/maven2,apache-snapshot=http://repository.apache.org/content/groups/snapshots/
{{ .CamelDependencies }}
{{ .CamelJBangDependencies }}
-//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:3.21.0}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.0.0-RC1}
package main;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-build-gradle.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-build-gradle.tmpl
index 3cc5a119d25..f5f530d059a 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-build-gradle.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-build-gradle.tmpl
@@ -1,12 +1,15 @@
plugins {
- id 'org.springframework.boot' version '{{ .SpringBootVersion }}'
- id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id 'java'
+ id 'org.springframework.boot' version '{{ .SpringBootVersion }}'
+ id 'io.spring.dependency-management' version '1.1.2'
}
group = '{{ .GroupId }}'
version = '{{ .Version }}'
-sourceCompatibility = '{{ .JavaVersion }}'
+
+java {
+ sourceCompatibility = '{{ .JavaVersion }}'
+}
repositories {
mavenCentral()