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/01/31 18:33:16 UTC
[camel] branch camel-3.x updated (b67161f6e27 -> a3c5efed108)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from b67161f6e27 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - AWS Eventbridge
new 82a37d5198a CAMEL-18989: camel-jbang - Run custom distributions of Camel
new b2b2395fa2d CAMEL-18989: camel-jbang - Run custom distributions of Camel
new a3c5efed108 camel-jbang - Upgrade to kamelet 3.20.1.1
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 87 +++++++++++++++++++++-
.../core/commands/catalog/CatalogBaseCommand.java | 1 +
.../jbang/core/commands/catalog/CatalogDoc.java | 2 +-
.../core/commands/catalog/CatalogKamelet.java | 2 +-
.../catalog => common}/VersionHelper.java | 4 +-
.../templates/run-custom-camel-version.tmpl} | 11 +--
.../camel-jbang-main/dist/CamelJBang.java | 2 +-
.../src/main/jbang/main/CamelJBang.java | 2 +-
10 files changed, 101 insertions(+), 14 deletions(-)
rename dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/{commands/catalog => common}/VersionHelper.java (95%)
copy dsl/camel-jbang/{camel-jbang-main/src/main/jbang/main/CamelJBang.java => camel-jbang-core/src/main/resources/templates/run-custom-camel-version.tmpl} (86%)
mode change 100755 => 100644
[camel] 01/03: CAMEL-18989: camel-jbang - Run custom distributions of Camel
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 82a37d5198a0a3de2818f0ccdca1be5dd2ff920f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 31 19:30:24 2023 +0100
CAMEL-18989: camel-jbang - Run custom distributions of Camel
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 87 +++++++++++++++++++++-
.../core/commands/catalog/CatalogBaseCommand.java | 1 +
.../catalog => common}/VersionHelper.java | 4 +-
.../templates/run-custom-camel-version.tmpl | 40 ++++++++++
4 files changed, 129 insertions(+), 3 deletions(-)
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 f5130d8123c..9166d8a17c1 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
@@ -51,6 +51,7 @@ import io.apicurio.datamodels.openapi.models.OasDocument;
import org.apache.camel.CamelContext;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.dsl.jbang.core.common.RuntimeUtil;
+import org.apache.camel.dsl.jbang.core.common.VersionHelper;
import org.apache.camel.generator.openapi.RestDslGenerator;
import org.apache.camel.impl.lw.LightweightCamelContext;
import org.apache.camel.main.KameletMain;
@@ -547,7 +548,14 @@ class Run extends CamelCommand {
// okay we have validated all input and are ready to run
if (camelVersion != null) {
// run in another JVM with different camel version (foreground or background)
- return runCamelVersion(main);
+ boolean custom = camelVersion.contains("-");
+ if (custom) {
+ // custom camel distribution
+ return runCustomCamelVersion(main);
+ } else {
+ // apache camel distribution
+ return runCamelVersion(main);
+ }
} else if (background) {
// spawn new JVM to run in background
return runBackground(main);
@@ -645,6 +653,83 @@ class Run extends CamelCommand {
return 0;
}
+ protected int runCustomCamelVersion(KameletMain main) throws Exception {
+ InputStream is = Run.class.getClassLoader().getResourceAsStream("templates/run-custom-camel-version.tmpl");
+ String content = IOHelper.loadText(is);
+ IOHelper.close(is);
+
+ content = content.replaceFirst("\\{\\{ \\.JavaVersion }}", "17"); // TODO: java 11 or 17
+ if (repos != null) {
+ content = content.replaceFirst("\\{\\{ \\.MavenRepositories }}", "//REPOS " + repos);
+ }
+
+ // use custom distribution of camel
+ StringBuilder sb = new StringBuilder();
+ sb.append(String.format("//DEPS org.apache.camel:camel-bom:%s@pom\n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-core:%s\n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-core-engine:%s\n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-main:%s\n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-java-joor-dsl:%s\n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-kamelet:%s\n", camelVersion));
+ content = content.replaceFirst("\\{\\{ \\.CamelDependencies }}", sb.toString());
+
+ // use apache distribution of camel-jbang
+ String v = camelVersion.substring(0, camelVersion.lastIndexOf('.'));
+ sb = new StringBuilder();
+ sb.append(String.format("//DEPS org.apache.camel:camel-jbang-core:%s\n", v));
+ sb.append(String.format("//DEPS org.apache.camel:camel-kamelet-main:%s\n", v));
+ sb.append(String.format("//DEPS org.apache.camel:camel-resourceresolver-github:%s\n", v));
+ if (VersionHelper.isGE(v, "3.19.0")) {
+ sb.append(String.format("//DEPS org.apache.camel:camel-cli-connector:%s\n", v));
+ }
+ content = content.replaceFirst("\\{\\{ \\.CamelJBangDependencies }}", sb.toString());
+
+ String fn = WORK_DIR + "/CustomCamelJBang.java";
+ Files.write(Paths.get(fn), content.getBytes(StandardCharsets.UTF_8));
+
+ String cmd = ProcessHandle.current().info().commandLine().orElse(null);
+ if (cmd != null) {
+ cmd = StringHelper.after(cmd, "main.CamelJBang ");
+ }
+ if (cmd == null) {
+ System.err.println("No Camel integration files to run");
+ return 1;
+ }
+ if (background) {
+ cmd = cmd.replaceFirst("--background=true", "");
+ cmd = cmd.replaceFirst("--background", "");
+ }
+ if (repos != null) {
+ if (!VersionHelper.isGE(v, "3.18.1")) {
+ // --repos is not supported in 3.18.0 or older, so remove
+ cmd = cmd.replaceFirst("--repos=" + repos, "");
+ }
+ }
+
+ cmd = cmd.replaceFirst("--camel-version=" + camelVersion, "");
+ // need to use jbang command to specify camel version
+ String jbang = "jbang " + WORK_DIR + "/CustomCamelJBang.java ";
+ cmd = jbang + cmd;
+
+ System.out.println(">>> " + cmd);
+
+ ProcessBuilder pb = new ProcessBuilder();
+ String[] arr = cmd.split("\\s+"); // TODO: safe split
+ List<String> args = Arrays.asList(arr);
+ pb.command(args);
+ if (background) {
+ Process p = pb.start();
+ System.out.println("Running Camel integration: " + name + " (version: " + camelVersion
+ + ") in background with PID: " + p.pid());
+ return 0;
+ } else {
+ pb.inheritIO(); // run in foreground (with IO so logs are visible)
+ Process p = pb.start();
+ // wait for that process to exit as we run in foreground
+ return p.waitFor();
+ }
+ }
+
protected int runKameletMain(KameletMain main) throws Exception {
main.start();
main.run();
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 448bba7a364..5cb43bfe1ae 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
@@ -28,6 +28,7 @@ import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.dsl.jbang.core.commands.CamelCommand;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.dsl.jbang.core.common.VersionHelper;
import org.apache.camel.main.download.MavenGav;
import org.apache.camel.tooling.model.ArtifactModel;
import picocli.CommandLine;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/VersionHelper.java
similarity index 95%
rename from dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
rename to dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/VersionHelper.java
index 587a56b70d8..cc22c2985e5 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/VersionHelper.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.jbang.core.commands.catalog;
+package org.apache.camel.dsl.jbang.core.common;
import org.apache.camel.util.StringHelper;
-final class VersionHelper {
+public final class VersionHelper {
private VersionHelper() {
}
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
new file mode 100644
index 00000000000..cd15762a79f
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/run-custom-camel-version.tmpl
@@ -0,0 +1,40 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//JAVA {{ .JavaVersion }}+
+{{ .MavenRepositories }}
+//REPOS mavencentral,apache-snapshot=http://repository.apache.org/content/groups/snapshots/
+{{ .CamelDependencies }}
+{{ .CamelJBangDependencies }}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:3.20.1.1}
+
+package main;
+
+import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+
+/**
+ * Main to run CamelJBang
+ */
+public class CustomCamelJBang {
+
+ public static void main(String... args) {
+ CamelJBangMain.run(args);
+ }
+
+}
[camel] 03/03: camel-jbang - Upgrade to kamelet 3.20.1.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a3c5efed108e033d7ffb83abbfa9260d58ecacbb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 31 19:33:07 2023 +0100
camel-jbang - Upgrade to kamelet 3.20.1.1
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java | 2 +-
dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java | 2 +-
dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java | 2 +-
6 files changed, 6 insertions(+), 6 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 3cb750a2650..50afb8fa92c 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
@@ -79,7 +79,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String javaVersion;
@CommandLine.Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.0")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.1.1")
protected String kameletsVersion;
@CommandLine.Option(names = { "--local-kamelet-dir" },
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 85ee118ff2b..1d3ce0d93e4 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 @@ class Init extends CamelCommand {
private String fromKamelet;
@Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.0")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.1.1")
private String kameletsVersion;
@Option(names = {
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 c5866b117fb..33297b470f2 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
@@ -70,7 +70,7 @@ public class CatalogDoc extends CamelCommand {
boolean headers;
@CommandLine.Option(names = {
- "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.0")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.1.1")
String kameletsVersion;
final CamelCatalog catalog = new DefaultCamelCatalog(true);
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 0d9903a6ef0..bf8af192b3c 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.0")
+ "--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "3.20.1.1")
String kameletsVersion;
public CatalogKamelet(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index 329838de0ee..4db731ff67b 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -21,7 +21,7 @@
//REPOS mavencentral,apache-snapshot=http://repository.apache.org/content/groups/snapshots/
//DEPS org.apache.camel:camel-bom:${camel.jbang.version:3.20.1}@pom
//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:3.20.1}
-//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:3.20.0}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:3.20.1.1}
package main;
diff --git a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
index 329838de0ee..4db731ff67b 100755
--- a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
@@ -21,7 +21,7 @@
//REPOS mavencentral,apache-snapshot=http://repository.apache.org/content/groups/snapshots/
//DEPS org.apache.camel:camel-bom:${camel.jbang.version:3.20.1}@pom
//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:3.20.1}
-//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:3.20.0}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:3.20.1.1}
package main;
[camel] 02/03: CAMEL-18989: camel-jbang - Run custom distributions of Camel
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b2b2395fa2d5f6922988a1b3ffd924eca0f7b001
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 31 19:32:13 2023 +0100
CAMEL-18989: camel-jbang - Run custom distributions of Camel
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 9166d8a17c1..ce67b82ae61 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
@@ -658,7 +658,7 @@ 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 }}", "11"); // TODO: java 11 or 17
if (repos != null) {
content = content.replaceFirst("\\{\\{ \\.MavenRepositories }}", "//REPOS " + repos);
}