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 ecb729dd3018cb278d9fb97cf86e2e4a605e9363 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Jan 27 09:09:13 2022 +0100 CAMEL-17398: Include core/dsl in catalog --- .../org/apache/camel/catalog/others.properties | 11 ++++++ dsl/camel-componentdsl/pom.xml | 1 + .../services/org/apache/camel/other.properties | 7 ---- .../src/generated/resources/dsl-support.json | 15 -------- .../services/org/apache/camel/other.properties | 7 ---- .../generated/resources/endpointdsl-support.json | 15 -------- dsl/camel-endpointdsl/pom.xml | 1 + .../services/org/apache/camel/other.properties | 7 ---- .../src/generated/resources/groovy-dsl-common.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../src/generated/resources/groovy-dsl-test.json | 14 ------- dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml | 1 + dsl/camel-java-joor-dsl/pom.xml | 1 + .../services/org/apache/camel/other.properties | 7 ---- .../src/generated/resources/jbang-core.json | 15 -------- .../services/org/apache/camel/other.properties | 7 ---- .../src/generated/resources/jbang-main.json | 15 -------- dsl/camel-js-dsl/pom.xml | 1 + dsl/camel-jsh-dsl/pom.xml | 1 + dsl/camel-kamelet-main/pom.xml | 17 +++++++++ dsl/camel-kotlin-dsl/pom.xml | 13 +++++++ dsl/camel-xml-io-dsl/pom.xml | 1 + .../services/org/apache/camel/other.properties | 7 ---- .../generated/resources/xml-jaxb-dsl-test-cdi.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../resources/xml-jaxb-dsl-test-definition.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../resources/xml-jaxb-dsl-test-jbpm.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../resources/xml-jaxb-dsl-test-spring.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../resources/xml-jaxb-dsl-test-swagger.json | 14 ------- dsl/camel-xml-jaxb-dsl/pom.xml | 1 + .../services/org/apache/camel/other.properties | 7 ---- .../src/generated/resources/yaml-dsl-common.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../resources/yaml-dsl-deserializers.json | 14 ------- .../services/org/apache/camel/other.properties | 7 ---- .../generated/resources/yaml-dsl-maven-plugin.json | 14 ------- dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 1 + dsl/pom.xml | 1 - .../camel/maven/packaging/PrepareCatalogMojo.java | 43 +++++++++++++++------- 42 files changed, 80 insertions(+), 312 deletions(-) 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 589ff33..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 @@ -7,18 +7,26 @@ cdi-main cloud cloudevents cluster +componentdsl console csimple-joor cxf-transport debug elytron +endpointdsl etcd3 +groovy-dsl headersmap health hystrix jasypt +java-joor-dsl jfr +js-dsl +jsh-dsl jta +kamelet-main +kotlin-dsl leveldb leveldb-legacy lra @@ -54,4 +62,7 @@ testcontainers-spring-junit5 threadpoolfactory-vertx tracing undertow-spring-security +xml-io-dsl +xml-jaxb-dsl +yaml-dsl zipkin diff --git a/dsl/camel-componentdsl/pom.xml b/dsl/camel-componentdsl/pom.xml index 05acb01..8ee0868 100644 --- a/dsl/camel-componentdsl/pom.xml +++ b/dsl/camel-componentdsl/pom.xml @@ -120,6 +120,7 @@ <id>generate-component-dsl</id> <goals> <goal>generate-component-dsl</goal> + <goal>generate-others-list</goal> </goals> <phase>generate-sources</phase> </execution> diff --git a/dsl/camel-dsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-dsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 8cb65b1..0000000 --- a/dsl/camel-dsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=dsl-support -groupId=org.apache.camel -artifactId=camel-dsl-support -version=3.15.0-SNAPSHOT -projectName=Camel :: DSL :: Support -projectDescription=Camel DSL Support diff --git a/dsl/camel-dsl-support/src/generated/resources/dsl-support.json b/dsl/camel-dsl-support/src/generated/resources/dsl-support.json deleted file mode 100644 index 589748f..0000000 --- a/dsl/camel-dsl-support/src/generated/resources/dsl-support.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "dsl-support", - "title": "DSL Support", - "description": "Camel DSL Support", - "deprecated": false, - "firstVersion": "3.10.0", - "label": "dsl", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-dsl-support", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-endpointdsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-endpointdsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index e0b446a..0000000 --- a/dsl/camel-endpointdsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=endpointdsl-support -groupId=org.apache.camel -artifactId=camel-endpointdsl-support -version=3.15.0-SNAPSHOT -projectName=Camel :: Endpoint DSL :: Support -projectDescription=Camel Endpoint DSL Support diff --git a/dsl/camel-endpointdsl-support/src/generated/resources/endpointdsl-support.json b/dsl/camel-endpointdsl-support/src/generated/resources/endpointdsl-support.json deleted file mode 100644 index 4c07ff4..0000000 --- a/dsl/camel-endpointdsl-support/src/generated/resources/endpointdsl-support.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "endpointdsl-support", - "title": "EndpointDSL Support", - "description": "Camel Endpoint DSL Support", - "deprecated": false, - "firstVersion": "3.15.0", - "label": "dsl", - "supportLevel": "Preview", - "groupId": "org.apache.camel", - "artifactId": "camel-endpointdsl-support", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml index 4ff6adc..1585ab1 100644 --- a/dsl/camel-endpointdsl/pom.xml +++ b/dsl/camel-endpointdsl/pom.xml @@ -124,6 +124,7 @@ <id>generate-endpoint-dsl</id> <goals> <goal>generate-endpoint-dsl</goal> + <goal>generate-others-list</goal> </goals> <phase>generate-sources</phase> </execution> diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 8474879..0000000 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=groovy-dsl-common -groupId=org.apache.camel -artifactId=camel-groovy-dsl-common -version=3.15.0-SNAPSHOT -projectName=Camel :: Groovy DSL :: Common -projectDescription=Camel DSL with Groovy (Common) diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/generated/resources/groovy-dsl-common.json b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/generated/resources/groovy-dsl-common.json deleted file mode 100644 index cfe601c..0000000 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/generated/resources/groovy-dsl-common.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "groovy-dsl-common", - "title": "Groovy Dsl Common", - "description": "Camel DSL with Groovy (Common)", - "deprecated": false, - "firstVersion": "3.10.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-groovy-dsl-common", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 7938fe5..0000000 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=groovy-dsl-test -groupId=org.apache.camel -artifactId=camel-groovy-dsl-test -version=3.15.0-SNAPSHOT -projectName=Camel :: Groovy DSL :: Test -projectDescription=Camel DSL with Groovy (Test) diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/generated/resources/groovy-dsl-test.json b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/generated/resources/groovy-dsl-test.json deleted file mode 100644 index d338fe0..0000000 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/generated/resources/groovy-dsl-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "groovy-dsl-test", - "title": "Groovy Dsl Test", - "description": "Camel DSL with Groovy (Test)", - "deprecated": false, - "firstVersion": "3.10.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-groovy-dsl-test", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml index 3b26259..a70a980 100644 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml +++ b/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml @@ -66,6 +66,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/camel-java-joor-dsl/pom.xml b/dsl/camel-java-joor-dsl/pom.xml index 65dd211..f1a279f 100644 --- a/dsl/camel-java-joor-dsl/pom.xml +++ b/dsl/camel-java-joor-dsl/pom.xml @@ -142,6 +142,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 9e9279d..0000000 --- a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=jbang-core -groupId=org.apache.camel -artifactId=camel-jbang-core -version=3.15.0-SNAPSHOT -projectName=Camel :: JBang :: Core -projectDescription=Camel JBang Core diff --git a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/jbang-core.json b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/jbang-core.json deleted file mode 100644 index 6e52119..0000000 --- a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/jbang-core.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "jbang-core", - "title": "Jbang Core", - "description": "Camel JBang Core", - "deprecated": false, - "firstVersion": "3.12.0", - "label": "jbang", - "supportLevel": "Experimental", - "groupId": "org.apache.camel", - "artifactId": "camel-jbang-core", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-jbang/camel-jbang-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-jbang/camel-jbang-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 9a26cec..0000000 --- a/dsl/camel-jbang/camel-jbang-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=jbang-main -groupId=org.apache.camel -artifactId=camel-jbang-main -version=3.15.0-SNAPSHOT -projectName=Camel :: JBang :: Main -projectDescription=Camel JBang diff --git a/dsl/camel-jbang/camel-jbang-main/src/generated/resources/jbang-main.json b/dsl/camel-jbang/camel-jbang-main/src/generated/resources/jbang-main.json deleted file mode 100644 index 664a574..0000000 --- a/dsl/camel-jbang/camel-jbang-main/src/generated/resources/jbang-main.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "jbang-main", - "title": "Jbang Main", - "description": "Camel JBang", - "deprecated": false, - "firstVersion": "3.12.0", - "label": "jbang", - "supportLevel": "Experimental", - "groupId": "org.apache.camel", - "artifactId": "camel-jbang-main", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-js-dsl/pom.xml b/dsl/camel-js-dsl/pom.xml index 5542742..93dea52 100644 --- a/dsl/camel-js-dsl/pom.xml +++ b/dsl/camel-js-dsl/pom.xml @@ -143,6 +143,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/camel-jsh-dsl/pom.xml b/dsl/camel-jsh-dsl/pom.xml index dc77448..ba85a34 100644 --- a/dsl/camel-jsh-dsl/pom.xml +++ b/dsl/camel-jsh-dsl/pom.xml @@ -137,6 +137,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/camel-kamelet-main/pom.xml b/dsl/camel-kamelet-main/pom.xml index 14ca86a..ed75a45 100644 --- a/dsl/camel-kamelet-main/pom.xml +++ b/dsl/camel-kamelet-main/pom.xml @@ -126,4 +126,21 @@ </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-package-maven-plugin</artifactId> + <executions> + <execution> + <id>generate</id> + <goals> + <goal>generate-others-list</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> diff --git a/dsl/camel-kotlin-dsl/pom.xml b/dsl/camel-kotlin-dsl/pom.xml index df4e932..51b1cb6 100644 --- a/dsl/camel-kotlin-dsl/pom.xml +++ b/dsl/camel-kotlin-dsl/pom.xml @@ -150,6 +150,19 @@ <build> <plugins> <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-package-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-spi</id> + <goals> + <goal>generate-spi</goal> + <goal>generate-others-list</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-maven-plugin</artifactId> <version>${kotlin-version}</version> diff --git a/dsl/camel-xml-io-dsl/pom.xml b/dsl/camel-xml-io-dsl/pom.xml index c5572d7..a2ae236 100644 --- a/dsl/camel-xml-io-dsl/pom.xml +++ b/dsl/camel-xml-io-dsl/pom.xml @@ -150,6 +150,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/camel-xml-jaxb-dsl-test/cdi/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-xml-jaxb-dsl-test/cdi/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 9fa5881..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/cdi/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=xml-jaxb-dsl-test-cdi -groupId=org.apache.camel -artifactId=camel-xml-jaxb-dsl-test-cdi -version=3.15.0-SNAPSHOT -projectName=Camel :: XML DSL Jaxb :: Test :: CDI -projectDescription=Camel XML DSL Tests with Jaxb and CDI diff --git a/dsl/camel-xml-jaxb-dsl-test/cdi/src/generated/resources/xml-jaxb-dsl-test-cdi.json b/dsl/camel-xml-jaxb-dsl-test/cdi/src/generated/resources/xml-jaxb-dsl-test-cdi.json deleted file mode 100644 index fb6e14b..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/cdi/src/generated/resources/xml-jaxb-dsl-test-cdi.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "xml-jaxb-dsl-test-cdi", - "title": "Xml Jaxb Dsl Test Cdi", - "description": "Camel XML DSL Tests with Jaxb and CDI", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-xml-jaxb-dsl-test-cdi", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-xml-jaxb-dsl-test/definition/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-xml-jaxb-dsl-test/definition/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 529e80b..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/definition/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=xml-jaxb-dsl-test-definition -groupId=org.apache.camel -artifactId=camel-xml-jaxb-dsl-test-definition -version=3.15.0-SNAPSHOT -projectName=Camel :: XML DSL Jaxb :: Test :: Definition -projectDescription=Camel XML DSL Tests with Jaxb and Definition diff --git a/dsl/camel-xml-jaxb-dsl-test/definition/src/generated/resources/xml-jaxb-dsl-test-definition.json b/dsl/camel-xml-jaxb-dsl-test/definition/src/generated/resources/xml-jaxb-dsl-test-definition.json deleted file mode 100644 index 2698458..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/definition/src/generated/resources/xml-jaxb-dsl-test-definition.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "xml-jaxb-dsl-test-definition", - "title": "Xml Jaxb Dsl Test Definition", - "description": "Camel XML DSL Tests with Jaxb and Definition", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-xml-jaxb-dsl-test-definition", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-xml-jaxb-dsl-test/jbpm/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-xml-jaxb-dsl-test/jbpm/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 5164451..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/jbpm/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=xml-jaxb-dsl-test-jbpm -groupId=org.apache.camel -artifactId=camel-xml-jaxb-dsl-test-jbpm -version=3.15.0-SNAPSHOT -projectName=Camel :: XML DSL Jaxb :: Test :: JBPM -projectDescription=Camel XML DSL Tests with Jaxb and JBPM diff --git a/dsl/camel-xml-jaxb-dsl-test/jbpm/src/generated/resources/xml-jaxb-dsl-test-jbpm.json b/dsl/camel-xml-jaxb-dsl-test/jbpm/src/generated/resources/xml-jaxb-dsl-test-jbpm.json deleted file mode 100644 index 92423c3..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/jbpm/src/generated/resources/xml-jaxb-dsl-test-jbpm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "xml-jaxb-dsl-test-jbpm", - "title": "Xml Jaxb Dsl Test Jbpm", - "description": "Camel XML DSL Tests with Jaxb and JBPM", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-xml-jaxb-dsl-test-jbpm", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-xml-jaxb-dsl-test/spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-xml-jaxb-dsl-test/spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 8595157..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=xml-jaxb-dsl-test-spring -groupId=org.apache.camel -artifactId=camel-xml-jaxb-dsl-test-spring -version=3.15.0-SNAPSHOT -projectName=Camel :: XML DSL Jaxb :: Test :: Spring -projectDescription=Camel XML DSL Tests with Jaxb and Spring diff --git a/dsl/camel-xml-jaxb-dsl-test/spring/src/generated/resources/xml-jaxb-dsl-test-spring.json b/dsl/camel-xml-jaxb-dsl-test/spring/src/generated/resources/xml-jaxb-dsl-test-spring.json deleted file mode 100644 index e5e0a60..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/spring/src/generated/resources/xml-jaxb-dsl-test-spring.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "xml-jaxb-dsl-test-spring", - "title": "Xml Jaxb Dsl Test Spring", - "description": "Camel XML DSL Tests with Jaxb and Spring", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-xml-jaxb-dsl-test-spring", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-xml-jaxb-dsl-test/swagger/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-xml-jaxb-dsl-test/swagger/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index f4a46b7..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/swagger/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=xml-jaxb-dsl-test-swagger -groupId=org.apache.camel -artifactId=camel-xml-jaxb-dsl-test-swagger -version=3.15.0-SNAPSHOT -projectName=Camel :: XML DSL Jaxb :: Test :: Swagger -projectDescription=Camel XML DSL Tests with Jaxb and Swagger diff --git a/dsl/camel-xml-jaxb-dsl-test/swagger/src/generated/resources/xml-jaxb-dsl-test-swagger.json b/dsl/camel-xml-jaxb-dsl-test/swagger/src/generated/resources/xml-jaxb-dsl-test-swagger.json deleted file mode 100644 index ee47a48..0000000 --- a/dsl/camel-xml-jaxb-dsl-test/swagger/src/generated/resources/xml-jaxb-dsl-test-swagger.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "xml-jaxb-dsl-test-swagger", - "title": "Xml Jaxb Dsl Test Swagger", - "description": "Camel XML DSL Tests with Jaxb and Swagger", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-xml-jaxb-dsl-test-swagger", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl/pom.xml index 391915f..6f5bca4 100644 --- a/dsl/camel-xml-jaxb-dsl/pom.xml +++ b/dsl/camel-xml-jaxb-dsl/pom.xml @@ -145,6 +145,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index ad28b4b..0000000 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=yaml-dsl-common -groupId=org.apache.camel -artifactId=camel-yaml-dsl-common -version=3.15.0-SNAPSHOT -projectName=Camel :: YAML DSL :: Common -projectDescription=Camel DSL with YAML Common diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/generated/resources/yaml-dsl-common.json b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/generated/resources/yaml-dsl-common.json deleted file mode 100644 index 507ccb0..0000000 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/generated/resources/yaml-dsl-common.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "yaml-dsl-common", - "title": "Yaml Dsl Common", - "description": "Camel DSL with YAML Common", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-yaml-dsl-common", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index f4bb730..0000000 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=yaml-dsl-deserializers -groupId=org.apache.camel -artifactId=camel-yaml-dsl-deserializers -version=3.15.0-SNAPSHOT -projectName=Camel :: YAML DSL :: Deserializers -projectDescription=Camel DSL with YAML Deserializers diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/resources/yaml-dsl-deserializers.json b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/resources/yaml-dsl-deserializers.json deleted file mode 100644 index e539da5..0000000 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/resources/yaml-dsl-deserializers.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "yaml-dsl-deserializers", - "title": "Yaml Dsl Deserializers", - "description": "Camel DSL with YAML Deserializers", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-yaml-dsl-deserializers", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 252af50..0000000 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=yaml-dsl-maven-plugin -groupId=org.apache.camel -artifactId=camel-yaml-dsl-maven-plugin -version=3.15.0-SNAPSHOT -projectName=Camel :: YAML DSL :: Maven Plugins -projectDescription=Maven plugin to auto generate YAML DSL diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/generated/resources/yaml-dsl-maven-plugin.json b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/generated/resources/yaml-dsl-maven-plugin.json deleted file mode 100644 index 07dfc7a..0000000 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/generated/resources/yaml-dsl-maven-plugin.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "yaml-dsl-maven-plugin", - "title": "Yaml Dsl Maven Plugin", - "description": "Maven plugin to auto generate YAML DSL", - "deprecated": false, - "firstVersion": "3.9.0", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-yaml-dsl-maven-plugin", - "version": "3.15.0-SNAPSHOT" - } -} diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml index 4c718d7..2779b55 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml @@ -298,6 +298,7 @@ <id>generate-spi</id> <goals> <goal>generate-spi</goal> + <goal>generate-others-list</goal> </goals> </execution> </executions> diff --git a/dsl/pom.xml b/dsl/pom.xml index 041946e..4a1224d 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -73,7 +73,6 @@ <id>generate-postcompile</id> <goals> <goal>generate-postcompile</goal> - <goal>generate-others-list</goal> </goals> <phase>prepare-package</phase> </execution> 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 d1b42f2..1af3d0a 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 @@ -241,6 +241,13 @@ public class PrepareCatalogMojo extends AbstractMojo { } }); + for (Path p : allJsonFiles) { + var m = JsonMapper.generateModel(p); + if (m != null) { + allModels.put(p, m); + } + } + // 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) .filter(dir -> Files.isDirectory(dir.resolve("src/generated/resources"))) @@ -248,16 +255,26 @@ public class PrepareCatalogMojo extends AbstractMojo { String f = p.getFileName().toString(); if (f.endsWith(PackageHelper.JSON_SUFIX)) { allJsonFiles.add(p); + var m = JsonMapper.generateModel(p); + if (m instanceof OtherModel) { + OtherModel om = (OtherModel) m; + if (!project.getVersion().equals(om.getVersion())) { + // update version in model and file because we prepare catalog before we build DSL + // so their previous generated model files may use previous version (eg 3.15.0-SNAPSHOT -> 3.15.0) + try { + String s = Files.readString(p); + s = s.replaceAll(om.getVersion(), project.getVersion()); + FileUtil.updateFile(p, s); + } catch (IOException e) { + // ignore + } + om.setVersion(project.getVersion()); + } + allModels.put(p, m); + } } }); - for (Path p : allJsonFiles) { - var m = JsonMapper.generateModel(p); - if (m != null) { - allModels.put(p, m); - } - } - executeModel(); Set<String> components = executeComponents(); Set<String> dataformats = executeDataFormats(); @@ -592,12 +609,12 @@ public class PrepareCatalogMojo extends AbstractMojo { case "camel-xml-io-util": case "camel-xml-jaxb": case "camel-xml-jaxp": - // and some from dsl + // and some from dsl case "dsl-support": case "camel-dsl-support": case "endpointdsl-support": case "camel-endpointdsl-support": - // and components with middle folders + // and components with middle folders case "camel-as2": case "camel-avro-rpc": case "camel-aws": @@ -704,10 +721,10 @@ public class PrepareCatalogMojo extends AbstractMojo { // find all camel maven modules Stream.concat( - list(componentsDir.toPath()) - .filter(dir -> !dir.getFileName().startsWith(".") && !"target".equals(dir.getFileName().toString())) - .flatMap(p -> getComponentPath(p).stream()), - Stream.of(coreDir.toPath(), languagesDir.toPath())) + list(componentsDir.toPath()) + .filter(dir -> !dir.getFileName().startsWith(".") && !"target".equals(dir.getFileName().toString())) + .flatMap(p -> getComponentPath(p).stream()), + Stream.of(coreDir.toPath(), languagesDir.toPath())) .forEach(dir -> { List<Path> l = PackageHelper.walk(dir.resolve("src/main/docs")) .filter(f -> f.getFileName().toString().endsWith(".adoc"))
