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/06/02 18:22:34 UTC
[camel] branch main updated: CAMEL-18151: camel-jbang - Export filter out duplicates.
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 f9275cda423 CAMEL-18151: camel-jbang - Export filter out duplicates.
f9275cda423 is described below
commit f9275cda423721175ac9e100ae7f2b4d34e87e64
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 2 20:22:13 2022 +0200
CAMEL-18151: camel-jbang - Export filter out duplicates.
---
.../org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 6 ++++++
.../org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 6 ++++++
.../org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 4 ++++
3 files changed, 16 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 2b8167acbca..d582f08638b 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
@@ -202,6 +202,12 @@ class ExportCamelMain extends CamelCommand {
}
}
}
+
+ // remove out of the box dependencies
+ answer.removeIf(s -> s.contains("camel-main"));
+ answer.removeIf(s -> s.contains("camel-health"));
+ answer.removeIf(s -> s.contains("camel-dsl-modeline"));
+
return answer;
}
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 d87ec15cef5..e5abbe44bb5 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
@@ -197,6 +197,12 @@ class ExportQuarkus extends CamelCommand {
}
}
}
+
+ // remove out of the box dependencies
+ answer.removeIf(s -> s.contains("camel-core"));
+ answer.removeIf(s -> s.contains("camel-platform-http"));
+ answer.removeIf(s -> s.contains("camel-microprofile-health"));
+
return answer;
}
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 f62043e11d3..fea55d041e8 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
@@ -209,6 +209,10 @@ class ExportSpringBoot extends CamelCommand {
}
}
}
+
+ // remove out of the box dependencies
+ answer.removeIf(s -> s.contains("camel-dsl-modeline"));
+
return answer;
}