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 687731c3fb3 CAMEL-21686: camel-jbang - Remove dependency on
camel-kamelets-utils (#16992)
687731c3fb3 is described below
commit 687731c3fb3de5eea57a6070759ad0de3e3ebd6d
Author: Thomas Diesler <tdies...@redhat.com>
AuthorDate: Fri Jan 31 14:15:50 2025 +0100
CAMEL-21686: camel-jbang - Remove dependency on camel-kamelets-utils
(#16992)
---
docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 7 -------
.../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 16 ++++++++++++----
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 54ecb4d3d85..f7880d19193 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -3440,7 +3440,6 @@ org.apache.camel:camel-rest:3.20.0
org.apache.camel:camel-stream:3.20.0
org.apache.camel:camel-timer:3.20.0
org.apache.camel:camel-yaml-dsl:3.20.0
-org.apache.camel.kamelets:camel-kamelets-utils:0.9.3
org.apache.camel.kamelets:camel-kamelets:0.9.3
----
@@ -3496,11 +3495,6 @@ camel dependency list --output=maven
<artifactId>camel-yaml-dsl</artifactId>
<version>3.20.0</version>
</dependency>
-<dependency>
- <groupId>org.apache.camel.kamelets</groupId>
- <artifactId>camel-kamelets-utils</artifactId>
- <version>0.9.3</version>
-</dependency>
<dependency>
<groupId>org.apache.camel.kamelets</groupId>
<artifactId>camel-kamelets</artifactId>
@@ -3523,7 +3517,6 @@ org.apache.camel.springboot:camel-rest-starter:3.20.0
org.apache.camel.springboot:camel-stream-starter:3.20.0
org.apache.camel.springboot:camel-timer-starter:3.20.0
org.apache.camel.springboot:camel-yaml-dsl-starter:3.20
-org.apache.camel.kamelets:camel-kamelets-utils:0.9.3
org.apache.camel.kamelets:camel-kamelets:0.9.3
----
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 aa7578b74b1..1d7e642e904 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
@@ -421,7 +421,9 @@ public abstract class ExportBaseCommand extends
CamelCommand {
if (asfKamelets) {
// include JARs for official ASF kamelets
answer.add("org.apache.camel.kamelets:camel-kamelets:"
+ kameletsVersion);
-
answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ if (VersionHelper.compare(camelVersion, "4.10.0") < 0)
{
+
answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ }
}
}
} else if (line.startsWith("camel.jbang.dependencies=")) {
@@ -435,7 +437,9 @@ public abstract class ExportBaseCommand extends
CamelCommand {
if (asfKamelets) {
// include JARs for official ASF kamelets
answer.add("org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
-
answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ if (VersionHelper.compare(camelVersion,
"4.10.0") < 0) {
+
answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ }
}
}
}
@@ -469,7 +473,9 @@ public abstract class ExportBaseCommand extends
CamelCommand {
if (asfKamelets) {
// include JARs for official ASF
kamelets
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
-
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets-utils:" +
kameletsVersion);
+ if
(VersionHelper.compare(camelVersion, "4.10.0") < 0) {
+
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets-utils:" +
kameletsVersion);
+ }
}
}
}
@@ -483,7 +489,9 @@ public abstract class ExportBaseCommand extends
CamelCommand {
if (asfKamelets) {
// include JARs for official ASF kamelets
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:"
+ kameletsVersion);
-
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets-utils:" +
kameletsVersion);
+ if (VersionHelper.compare(camelVersion, "4.10.0") < 0) {
+
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets-utils:" +
kameletsVersion);
+ }
}
} else if (line.startsWith("modeline=")) {
answer.add("camel:dsl-modeline");
