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/01/27 10:15:38 UTC
[camel] 02/02: CAMEL-17398: Include core/dsl in catalog
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 c021916bae78f78825217d82130c8f08f76d6bdc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 27 11:14:59 2022 +0100
CAMEL-17398: Include core/dsl in catalog
---
.../resources/org/apache/camel/catalog/others.properties | 2 ++
.../org/apache/camel/catalog/others/groovy-dsl.json | 15 +++++++++++++++
.../org/apache/camel/catalog/others/yaml-dsl.json | 15 +++++++++++++++
.../java/org/apache/camel/maven/packaging/MojoHelper.java | 4 ++++
.../apache/camel/maven/packaging/PrepareCatalogMojo.java | 1 +
5 files changed, 37 insertions(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index ce91a0d..0fb5b58 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -15,6 +15,7 @@ debug
elytron
endpointdsl
etcd3
+groovy-dsl
headersmap
health
hystrix
@@ -63,4 +64,5 @@ tracing
undertow-spring-security
xml-io-dsl
xml-jaxb-dsl
+yaml-dsl
zipkin
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
new file mode 100644
index 0000000..89e0f2d
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "groovy-dsl",
+ "title": "Groovy Dsl",
+ "description": "Camel DSL with Groovy",
+ "deprecated": false,
+ "firstVersion": "3.9.0",
+ "label": "dsl",
+ "supportLevel": "Experimental",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-groovy-dsl",
+ "version": "3.15.0-SNAPSHOT"
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
new file mode 100644
index 0000000..efbd056
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "yaml-dsl",
+ "title": "YAML DSL",
+ "description": "Camel DSL with YAML",
+ "deprecated": false,
+ "firstVersion": "3.9.0",
+ "label": "dsl",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-yaml-dsl",
+ "version": "3.15.0-SNAPSHOT"
+ }
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
index 6c747f7..f4c3811 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
@@ -94,6 +94,10 @@ public final class MojoHelper {
dir.resolve("camel-huaweicloud-obs"));
case "camel-knative":
return Collections.singletonList(dir.resolve("camel-knative-component"));
+ case "camel-groovy-dsl":
+ return Collections.singletonList(dir.resolve("camel-groovy-dsl"));
+ case "camel-yaml-dsl":
+ return Collections.singletonList(dir.resolve("camel-yaml-dsl"));
default:
return Collections.singletonList(dir);
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index c7428ff..73d416c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -250,6 +250,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
// special for dsl-dir as its built after camel-catalog, so we can only look inside src/generated
Stream.of(list(dslDir.toPath())).flatMap(s -> s)
+ .flatMap(p -> getComponentPath(p).stream())
.filter(dir -> Files.isDirectory(dir.resolve("src/generated/resources")))
.flatMap(PackageHelper::walk).forEach(p -> {
String f = p.getFileName().toString();