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 2022/11/09 09:53:11 UTC

[camel] 02/02: camel-jbang - Export fix pom.xml when using camel-kamelets-utils to avoid mixed camel versions on classpath

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 97c9370d84c94d30af45993e49cb953185559c37
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Nov 9 10:52:42 2022 +0100

    camel-jbang - Export fix pom.xml when using camel-kamelets-utils to avoid mixed camel versions on classpath
---
 .../org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java  | 9 ++++++++-
 .../apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java   | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

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 c1a79ed7454..9bf218d6ea6 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
@@ -232,7 +232,14 @@ class ExportQuarkus extends Export {
 
         StringBuilder sb = new StringBuilder();
         for (MavenGav gav : gavs) {
-            sb.append("    implementation '").append(gav.toString()).append("'\n");
+            // special for camel-kamelets-utils
+            if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+                sb.append("    implementation ('").append(gav).append("') {\n");
+                sb.append("        exclude group: 'org.apache.camel', module: '*'\n");
+                sb.append("    }\n");
+            } else {
+                sb.append("    implementation '").append(gav).append("'\n");
+            }
         }
         context = context.replaceFirst("\\{\\{ \\.CamelDependencies }}", sb.toString());
 
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 2526aa2893a..50e63f67092 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -308,7 +308,14 @@ class ExportSpringBoot extends Export {
 
         StringBuilder sb = new StringBuilder();
         for (MavenGav gav : gavs) {
-            sb.append("    implementation '").append(gav.toString()).append("'\n");
+            // special for camel-kamelets-utils
+            if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+                sb.append("    implementation ('").append(gav).append("') {\n");
+                sb.append("        exclude group: 'org.apache.camel', module: '*'\n");
+                sb.append("    }\n");
+            } else {
+                sb.append("    implementation '").append(gav).append("'\n");
+            }
         }
         context = context.replaceFirst("\\{\\{ \\.CamelDependencies }}", sb.toString());