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:10 UTC
[camel] 01/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 3b14a2b30aba8c76153f69de3b8360e56f0dea3d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Nov 9 10:44:08 2022 +0100
camel-jbang - Export fix pom.xml when using camel-kamelets-utils to avoid mixed camel versions on classpath
---
.../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 9 +++++++++
.../org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 9 +++++++++
.../apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 9 +++++++++
3 files changed, 27 insertions(+)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index 0a715f0e504..3dd641752bf 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -177,6 +177,15 @@ class ExportCamelMain extends Export {
if (gav.getVersion() != null) {
sb.append(" <version>").append(gav.getVersion()).append("</version>\n");
}
+ // special for camel-kamelets-utils
+ if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ sb.append(" <exclusions>\n");
+ sb.append(" <exclusion>\n");
+ sb.append(" <groupId>org.apache.camel</groupId>\n");
+ sb.append(" <artifactId>*</artifactId>\n");
+ sb.append(" </exclusion>\n");
+ sb.append(" </exclusions>\n");
+ }
sb.append(" </dependency>\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/ExportQuarkus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 7d5dbbf6f0b..c1a79ed7454 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
@@ -335,6 +335,15 @@ class ExportQuarkus extends Export {
if (gav.getVersion() != null) {
sb.append(" <version>").append(gav.getVersion()).append("</version>\n");
}
+ // special for camel-kamelets-utils
+ if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ sb.append(" <exclusions>\n");
+ sb.append(" <exclusion>\n");
+ sb.append(" <groupId>org.apache.camel</groupId>\n");
+ sb.append(" <artifactId>*</artifactId>\n");
+ sb.append(" </exclusion>\n");
+ sb.append(" </exclusions>\n");
+ }
sb.append(" </dependency>\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 44d98ca2bab..2526aa2893a 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
@@ -220,6 +220,15 @@ class ExportSpringBoot extends Export {
if (gav.getVersion() != null) {
sb.append(" <version>").append(gav.getVersion()).append("</version>\n");
}
+ // special for camel-kamelets-utils
+ if ("camel-kamelets-utils".equals(gav.getArtifactId())) {
+ sb.append(" <exclusions>\n");
+ sb.append(" <exclusion>\n");
+ sb.append(" <groupId>org.apache.camel</groupId>\n");
+ sb.append(" <artifactId>*</artifactId>\n");
+ sb.append(" </exclusion>\n");
+ sb.append(" </exclusions>\n");
+ }
sb.append(" </dependency>\n");
}
context = context.replaceFirst("\\{\\{ \\.CamelDependencies }}", sb.toString());