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/18 19:15:06 UTC
[camel] branch main updated: CAMEL-18207: camel-yaml-dsl - YAML Schema should be in schema sub folder. Automatic update parent/allcomponents pom.xml with components/dsl where applicable.
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 2810899cf31 CAMEL-18207: camel-yaml-dsl - YAML Schema should be in schema sub folder. Automatic update parent/allcomponents pom.xml with components/dsl where applicable.
2810899cf31 is described below
commit 2810899cf31af7dd1d1ef6a601578e6273ac83fa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jun 18 19:42:55 2022 +0200
CAMEL-18207: camel-yaml-dsl - YAML Schema should be in schema sub folder. Automatic update parent/allcomponents pom.xml with components/dsl where applicable.
---
bom/camel-bom/pom.xml | 5 -
.../camel/catalog/maven/MavenVersionManager.java | 19 ++-
.../org/apache/camel/catalog/others.properties | 3 +
.../apache/camel/catalog/others/dsl-modeline.json | 15 ++
.../apache/camel/catalog/others/dsl-support.json | 15 ++
.../org/apache/camel/catalog/others/yaml-dsl.json | 15 ++
docs/components/modules/others/nav.adoc | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_18.adoc | 4 +
.../services/org/apache/camel/other.properties | 7 +
.../src/generated/resources/dsl-modeline.json | 15 ++
.../src/main/docs/dsl-modeline.adoc | 7 +-
dsl/camel-dsl-support/pom.xml | 17 ---
.../services/org/apache/camel/other.properties | 7 +
.../src/generated/resources/dsl-support.json | 15 ++
dsl/camel-endpointdsl-support/pom.xml | 18 +--
.../camel-groovy-dsl-common/pom.xml | 13 +-
dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml | 1 +
dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml | 18 ---
dsl/camel-java-joor-dsl/pom.xml | 19 ---
dsl/camel-jbang/camel-jbang-core/pom.xml | 1 +
dsl/camel-jbang/camel-jbang-main/pom.xml | 1 +
dsl/camel-js-dsl/pom.xml | 19 ---
dsl/camel-jsh-dsl/pom.xml | 19 ---
dsl/camel-kamelet-main/pom.xml | 17 ---
dsl/camel-kotlin-dsl/pom.xml | 13 --
dsl/camel-xml-io-dsl/pom.xml | 18 ---
dsl/camel-xml-jaxb-dsl-test/pom.xml | 4 +
dsl/camel-xml-jaxb-dsl/pom.xml | 19 ---
dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml | 1 +
.../camel-yaml-dsl-deserializers/pom.xml | 1 +
.../camel-yaml-dsl-maven-plugin/pom.xml | 1 +
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 19 +--
.../services/org/apache/camel/other.properties | 7 +
.../resources/{ => schema}/camel-yaml-dsl.json | 0
.../resources/{ => schema}/camelYamlDsl.json | 0
.../src/generated/resources/yaml-dsl.json | 15 ++
.../camel/dsl/yaml/support/YamlTestSupport.groovy | 2 +-
dsl/pom.xml | 14 +-
parent/pom.xml | 151 ++++++++++-----------
.../camel/maven/packaging/PackageOtherMojo.java | 6 -
.../maven/packaging/PrepareComponentMojo.java | 51 +++++--
41 files changed, 272 insertions(+), 322 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 1935e31f6bf..02b00cf763c 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1297,11 +1297,6 @@
<artifactId>camel-knative-http</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-kotlin-dsl</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kubernetes</artifactId>
diff --git a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index 108bdbcbed8..c02ca582758 100644
--- a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++ b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -41,13 +41,19 @@ public class MavenVersionManager implements VersionManager, Closeable {
private static final Logger LOG = LoggerFactory.getLogger(MavenVersionManager.class);
- private final ClassLoader classLoader = new GroovyClassLoader();
+ private ClassLoader classLoader;
+ private final ClassLoader groovyClassLoader = new GroovyClassLoader();
private final TimeoutHttpClientHandler httpClient = new TimeoutHttpClientHandler();
private String version;
private String runtimeProviderVersion;
private String cacheDirectory;
private boolean log;
+ @Override
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
+ }
+
/**
* Configures the directory for the download cache.
* <p/>
@@ -105,7 +111,7 @@ public class MavenVersionManager implements VersionManager, Closeable {
Grape.setEnableAutoDownload(true);
Map<String, Object> param = new HashMap<>();
- param.put("classLoader", classLoader);
+ param.put("classLoader", groovyClassLoader);
param.put("group", "org.apache.camel");
param.put("module", "camel-catalog");
param.put("version", version);
@@ -135,7 +141,7 @@ public class MavenVersionManager implements VersionManager, Closeable {
Grape.setEnableAutoDownload(true);
Map<String, Object> param = new HashMap<>();
- param.put("classLoader", classLoader);
+ param.put("classLoader", groovyClassLoader);
param.put("group", groupId);
param.put("module", artifactId);
param.put("version", version);
@@ -162,11 +168,14 @@ public class MavenVersionManager implements VersionManager, Closeable {
if (is == null && version != null) {
is = doGetResourceAsStream(name, version);
}
+ if (classLoader != null && is == null) {
+ is = classLoader.getResourceAsStream(name);
+ }
if (is == null) {
is = MavenVersionManager.class.getClassLoader().getResourceAsStream(name);
}
if (is == null) {
- is = classLoader.getResourceAsStream(name);
+ is = groovyClassLoader.getResourceAsStream(name);
}
return is;
@@ -179,7 +188,7 @@ public class MavenVersionManager implements VersionManager, Closeable {
try {
URL found = null;
- Enumeration<URL> urls = classLoader.getResources(name);
+ Enumeration<URL> urls = groovyClassLoader.getResources(name);
while (urls.hasMoreElements()) {
URL url = urls.nextElement();
if (url.getPath().contains(version)) {
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 6f96ca78b03..5c674828f14 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
@@ -12,6 +12,8 @@ console
csimple-joor
cxf-transport
debug
+dsl-modeline
+dsl-support
elytron
endpointdsl
etcd3
@@ -59,4 +61,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/dsl-modeline.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
new file mode 100644
index 00000000000..43f396a0baf
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "dsl-modeline",
+ "title": "DSL Modeline",
+ "description": "Camel DSL Camel K modeline",
+ "deprecated": false,
+ "firstVersion": "3.16.0",
+ "label": "dsl",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-dsl-modeline",
+ "version": "3.18.0-SNAPSHOT"
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
new file mode 100644
index 00000000000..8972378f2b2
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
@@ -0,0 +1,15 @@
+{
+ "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.18.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 00000000000..71c37e6a932
--- /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.18.0-SNAPSHOT"
+ }
+}
diff --git a/docs/components/modules/others/nav.adoc b/docs/components/modules/others/nav.adoc
index a08b9c66c90..3a4e32a00e4 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -13,7 +13,7 @@
** xref:cxf-transport.adoc[CXF Transport]
** xref:debug.adoc[Debug]
** xref:dsl.adoc[DSL]
-*** xref:dsl-modeline.adoc[DSL modeline]
+*** xref:dsl-modeline.adoc[DSL Modeline]
*** xref:groovy-dsl.adoc[Groovy Dsl]
*** xref:java-joor-dsl.adoc[Java DSL (runtime compiled)]
*** xref:js-dsl.adoc[JavaScript DSL]
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc
index 97c28a76d1b..5d824dcc07a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc
@@ -24,3 +24,7 @@ The `camel-milo` feature has been removed.
The `keyResource` option has been changed to `serviceAccountKey` to match to Google semantic. Then, if you use the `keyResource`
to Google Drive component, you should update it to `serviceAccountKey`.
+
+=== camel-yaml-dsl
+
+The YAML DSL schema files `camel-yaml-dsl.json` and `camelYamlDsl.json` has been moved from root to `schema` sub folder in the JAR.
diff --git a/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/other.properties
new file mode 100644
index 00000000000..8ca0e9e8283
--- /dev/null
+++ b/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=dsl-modeline
+groupId=org.apache.camel
+artifactId=camel-dsl-modeline
+version=3.18.0-SNAPSHOT
+projectName=Camel :: DSL :: Modeline
+projectDescription=Camel DSL Camel K modeline
diff --git a/dsl/camel-dsl-modeline/src/generated/resources/dsl-modeline.json b/dsl/camel-dsl-modeline/src/generated/resources/dsl-modeline.json
new file mode 100644
index 00000000000..43f396a0baf
--- /dev/null
+++ b/dsl/camel-dsl-modeline/src/generated/resources/dsl-modeline.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "dsl-modeline",
+ "title": "DSL Modeline",
+ "description": "Camel DSL Camel K modeline",
+ "deprecated": false,
+ "firstVersion": "3.16.0",
+ "label": "dsl",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-dsl-modeline",
+ "version": "3.18.0-SNAPSHOT"
+ }
+}
diff --git a/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc b/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
index a48c863645f..068cc2ca66b 100644
--- a/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
+++ b/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
@@ -1,10 +1,10 @@
-= DSL modeline Component
-:doctitle: DSL modeline
+= DSL Modeline Component
+:doctitle: DSL Modeline
:shortname: dsl-modeline
:artifactid: camel-dsl-modeline
:description: Camel DSL Camel K modeline
:since: 3.16
-:supportlevel: Preview
+:supportlevel: Stable
//Manually maintained attributes
:group: DSL
@@ -18,4 +18,3 @@ The following traits is supported:
- env
- name
- property
-
diff --git a/dsl/camel-dsl-support/pom.xml b/dsl/camel-dsl-support/pom.xml
index f1ded7078fd..6c63b890503 100644
--- a/dsl/camel-dsl-support/pom.xml
+++ b/dsl/camel-dsl-support/pom.xml
@@ -50,21 +50,4 @@
</dependency>
</dependencies>
- <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>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
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
new file mode 100644
index 00000000000..29b9af667bd
--- /dev/null
+++ b/dsl/camel-dsl-support/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=dsl-support
+groupId=org.apache.camel
+artifactId=camel-dsl-support
+version=3.18.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
new file mode 100644
index 00000000000..8972378f2b2
--- /dev/null
+++ b/dsl/camel-dsl-support/src/generated/resources/dsl-support.json
@@ -0,0 +1,15 @@
+{
+ "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.18.0-SNAPSHOT"
+ }
+}
diff --git a/dsl/camel-endpointdsl-support/pom.xml b/dsl/camel-endpointdsl-support/pom.xml
index e04bbaf4ad5..04e606ca60f 100644
--- a/dsl/camel-endpointdsl-support/pom.xml
+++ b/dsl/camel-endpointdsl-support/pom.xml
@@ -37,6 +37,7 @@
<firstVersion>3.15.0</firstVersion>
<title>EndpointDSL Support</title>
<label>dsl</label>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
@@ -50,21 +51,4 @@
</dependency>
</dependencies>
- <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>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml
index ef8eea0ed56..630b6b7c4f8 100644
--- a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml
+++ b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml
@@ -41,6 +41,7 @@
<sourcecheckExcludesComma>
${sourcecheckExcludes},
</sourcecheckExcludesComma>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
@@ -82,18 +83,6 @@
<invokeDynamic>true</invokeDynamic>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-spi</id>
- <goals>
- <goal>generate-spi</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml
index a4854731505..48c4348c01d 100644
--- a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml
+++ b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml
@@ -41,6 +41,7 @@
<sourcecheckExcludesComma>
${sourcecheckExcludes},
</sourcecheckExcludesComma>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml
index b3f08878d62..c8baec15145 100644
--- a/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml
+++ b/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml
@@ -56,22 +56,4 @@
</dependency>
</dependencies>
- <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>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-java-joor-dsl/pom.xml b/dsl/camel-java-joor-dsl/pom.xml
index 4eabc2563d7..a7591197fb0 100644
--- a/dsl/camel-java-joor-dsl/pom.xml
+++ b/dsl/camel-java-joor-dsl/pom.xml
@@ -131,23 +131,4 @@
</dependency>
</dependencies>
-
- <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>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 79cde8862ac..2f9e0a52014 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -40,6 +40,7 @@
<firstVersion>3.12.0</firstVersion>
<label>jbang</label>
<supportLevel>Preview</supportLevel>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
diff --git a/dsl/camel-jbang/camel-jbang-main/pom.xml b/dsl/camel-jbang/camel-jbang-main/pom.xml
index c38a4b32a44..f3316263ed0 100644
--- a/dsl/camel-jbang/camel-jbang-main/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-main/pom.xml
@@ -41,6 +41,7 @@
<supportLevel>Preview</supportLevel>
<checkstyle.skip>true</checkstyle.skip>
<dist.dir>dist</dist.dir>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
diff --git a/dsl/camel-js-dsl/pom.xml b/dsl/camel-js-dsl/pom.xml
index 9704e9f832c..f446bf3fe83 100644
--- a/dsl/camel-js-dsl/pom.xml
+++ b/dsl/camel-js-dsl/pom.xml
@@ -132,23 +132,4 @@
</dependency>
</dependencies>
-
- <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>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-jsh-dsl/pom.xml b/dsl/camel-jsh-dsl/pom.xml
index 1e7611ea709..3bd1919ab3c 100644
--- a/dsl/camel-jsh-dsl/pom.xml
+++ b/dsl/camel-jsh-dsl/pom.xml
@@ -126,23 +126,4 @@
</dependency>
</dependencies>
-
- <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>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-kamelet-main/pom.xml b/dsl/camel-kamelet-main/pom.xml
index 8302083e0a0..e70888267b5 100644
--- a/dsl/camel-kamelet-main/pom.xml
+++ b/dsl/camel-kamelet-main/pom.xml
@@ -147,21 +147,4 @@
</dependency>
</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 60984135f91..bd875e2c156 100644
--- a/dsl/camel-kotlin-dsl/pom.xml
+++ b/dsl/camel-kotlin-dsl/pom.xml
@@ -149,19 +149,6 @@
<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>
diff --git a/dsl/camel-xml-io-dsl/pom.xml b/dsl/camel-xml-io-dsl/pom.xml
index 5c189ec0649..f7dbc0e7077 100644
--- a/dsl/camel-xml-io-dsl/pom.xml
+++ b/dsl/camel-xml-io-dsl/pom.xml
@@ -140,22 +140,4 @@
</dependency>
</dependencies>
- <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>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-xml-jaxb-dsl-test/pom.xml b/dsl/camel-xml-jaxb-dsl-test/pom.xml
index aa06dd4b771..212830f20ff 100644
--- a/dsl/camel-xml-jaxb-dsl-test/pom.xml
+++ b/dsl/camel-xml-jaxb-dsl-test/pom.xml
@@ -33,6 +33,10 @@
<name>Camel :: XML DSL Jaxb :: Tests</name>
<description>Camel XML DSL Tests with camel-xml-jaxb</description>
+ <properties>
+ <camel-prepare-component>false</camel-prepare-component>
+ </properties>
+
<modules>
<module>definition</module>
<module>cdi</module>
diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl/pom.xml
index 246344c3182..b0e0450b251 100644
--- a/dsl/camel-xml-jaxb-dsl/pom.xml
+++ b/dsl/camel-xml-jaxb-dsl/pom.xml
@@ -134,23 +134,4 @@
</dependency>
</dependencies>
-
- <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>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
index 25987f00d53..5d732ceb0a0 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
@@ -41,6 +41,7 @@
<sourcecheckExcludesComma>
${sourcecheckExcludes},
</sourcecheckExcludesComma>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index f2f80aafa16..05dc02de320 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -41,6 +41,7 @@
<sourcecheckExcludesComma>
${sourcecheckExcludes},
</sourcecheckExcludesComma>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 48a40e1a9f2..e934db7c7b2 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -34,6 +34,7 @@
<properties>
<firstVersion>3.9.0</firstVersion>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencyManagement>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
index 09f886e1c21..940671a5751 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
@@ -265,7 +265,7 @@
</goals>
<configuration>
<kebabCase>false</kebabCase>
- <outputFile>src/generated/resources/camelYamlDsl.json</outputFile>
+ <outputFile>src/generated/resources/schema/camelYamlDsl.json</outputFile>
<bannedDefinitions>
<bannedDefinition>org.apache.camel.model.FromDefinition</bannedDefinition>
</bannedDefinitions>
@@ -280,7 +280,7 @@
</goals>
<configuration>
<kebabCase>true</kebabCase>
- <outputFile>src/generated/resources/camel-yaml-dsl.json</outputFile>
+ <outputFile>src/generated/resources/schema/camel-yaml-dsl.json</outputFile>
<bannedDefinitions>
<bannedDefinition>org.apache.camel.model.FromDefinition</bannedDefinition>
</bannedDefinitions>
@@ -301,7 +301,7 @@
</goals>
<configuration>
<specificationUri>${project.basedir}/src/test/resources/openapi.json</specificationUri>
- <outputDirectory>${project.build.outputDirectory}/rest-dsl</outputDirectory>
+ <outputDirectory>${project.build.testOutputDirectory}/rest-dsl</outputDirectory>
<fileName>generated-rest-dsl.yaml</fileName>
</configuration>
</execution>
@@ -323,19 +323,6 @@
<invokeDynamic>true</invokeDynamic>
</configuration>
</plugin>
- <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>
</plugins>
</build>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
new file mode 100644
index 00000000000..67f5132e7a5
--- /dev/null
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=yaml-dsl
+groupId=org.apache.camel
+artifactId=camel-yaml-dsl
+version=3.18.0-SNAPSHOT
+projectName=Camel :: YAML DSL
+projectDescription=Camel DSL with YAML
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
similarity index 100%
rename from dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
rename to dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
similarity index 100%
rename from dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
rename to dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/yaml-dsl.json
new file mode 100644
index 00000000000..71c37e6a932
--- /dev/null
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/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.18.0-SNAPSHOT"
+ }
+}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
index 176165e89f7..692d9ab7c00 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
@@ -41,7 +41,7 @@ import java.nio.charset.StandardCharsets
@Slf4j
class YamlTestSupport extends Specification implements HasCamelContext {
static def MAPPER = new ObjectMapper(new YAMLFactory())
- static def SCHEMA_RES = JsonLoader.fromResource('/camel-yaml-dsl.json')
+ static def SCHEMA_RES = JsonLoader.fromResource('/schema/camel-yaml-dsl.json')
static def SCHEMA = JsonSchemaFactory.byDefault().getJsonSchema(SCHEMA_RES)
@AutoCleanup
diff --git a/dsl/pom.xml b/dsl/pom.xml
index 3c003adb5c0..30da08d3f1b 100644
--- a/dsl/pom.xml
+++ b/dsl/pom.xml
@@ -33,6 +33,12 @@
<name>Camel :: DSL :: Parent</name>
<description>Camel DSL Parent</description>
+ <properties>
+ <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
+ <camel.surefire.parallel>true</camel.surefire.parallel>
+ <camel-prepare-component>true</camel-prepare-component>
+ </properties>
+
<modules>
<module>camel-endpointdsl</module>
<module>camel-componentdsl</module>
@@ -52,16 +58,14 @@
<module>camel-jbang</module>
</modules>
- <properties>
- <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
- <camel.surefire.parallel>true</camel.surefire.parallel>
- </properties>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
+ <configuration>
+ </configuration>
+
<executions>
<execution>
<id>generate</id>
diff --git a/parent/pom.xml b/parent/pom.xml
index b8832d50726..2692003fb2e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -655,11 +655,6 @@
<artifactId>camel-core-engine</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-languages</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-model</artifactId>
@@ -675,16 +670,6 @@
<artifactId>camel-core-reifier</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-endpointdsl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-componentdsl</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-xml</artifactId>
@@ -700,21 +685,6 @@
<artifactId>camel-cluster</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-endpointdsl-support</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-dsl-modeline</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-dsl-support</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-health</artifactId>
@@ -745,11 +715,6 @@
<artifactId>camel-xml-jaxb</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xml-jaxp</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-allcomponents</artifactId>
@@ -1149,6 +1114,11 @@
<artifactId>camel-cometd</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-componentdsl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-consul</artifactId>
@@ -1164,6 +1134,11 @@
<artifactId>camel-corda</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-couchbase</artifactId>
@@ -1324,6 +1299,16 @@
<artifactId>camel-dropbox</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-dsl-modeline</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-dsl-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dynamic-router</artifactId>
@@ -1344,6 +1329,11 @@
<artifactId>camel-elytron</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-endpointdsl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-etcd3</artifactId>
@@ -1499,6 +1489,11 @@
<artifactId>camel-grok</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-groovy-dsl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-groovy</artifactId>
@@ -1694,6 +1689,11 @@
<artifactId>camel-jasypt</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-java-joor-dsl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jaxb</artifactId>
@@ -1794,11 +1794,21 @@
<artifactId>camel-jq</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-js-dsl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jsch</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jsh-dsl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jslt</artifactId>
@@ -1849,6 +1859,11 @@
<artifactId>camel-kafka</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-kamelet-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kamelet</artifactId>
@@ -2686,125 +2701,105 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlsecurity</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xmpp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xpath</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xslt-saxon</artifactId>
+ <artifactId>camel-xml-io-dsl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xslt</artifactId>
+ <artifactId>camel-xml-jaxb-dsl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xstream</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zendesk</artifactId>
+ <artifactId>camel-xmlsecurity</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zip-deflater</artifactId>
+ <artifactId>camel-xmpp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zipfile</artifactId>
+ <artifactId>camel-xpath</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zipkin</artifactId>
+ <artifactId>camel-xslt-saxon</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zookeeper-master</artifactId>
+ <artifactId>camel-xslt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-zookeeper</artifactId>
+ <artifactId>camel-xstream</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- camel components: END -->
-
- <!-- camel dsl -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-java-joor-dsl</artifactId>
+ <artifactId>camel-yaml-dsl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-yaml-dsl-common</artifactId>
+ <artifactId>camel-zendesk</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-yaml-dsl-deserializers</artifactId>
+ <artifactId>camel-zip-deflater</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xml-io-dsl</artifactId>
+ <artifactId>camel-zipfile</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xml-jaxb-dsl</artifactId>
+ <artifactId>camel-zipkin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-yaml-dsl</artifactId>
+ <artifactId>camel-zookeeper-master</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-js-dsl</artifactId>
+ <artifactId>camel-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- camel components: END -->
+
+ <!-- camel dsl support -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jsh-dsl</artifactId>
+ <artifactId>camel-endpointdsl-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-kotlin-dsl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-groovy-dsl</artifactId>
+ <artifactId>camel-groovy-dsl-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-groovy-dsl-common</artifactId>
+ <artifactId>camel-yaml-dsl-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-kamelet-main</artifactId>
+ <artifactId>camel-yaml-dsl-deserializers</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
index fb2ab156cb5..5d4e93720a8 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
@@ -40,15 +40,9 @@ import org.sonatype.plexus.build.incremental.BuildContext;
@Mojo(name = "generate-others-list", threadSafe = true)
public class PackageOtherMojo extends AbstractGeneratorMojo {
- /**
- * The output directory for generated components file
- */
@Parameter(defaultValue = "${project.basedir}/src/generated/resources")
protected File otherOutDir;
- /**
- * The output directory for generated languages file
- */
@Parameter(defaultValue = "${project.basedir}/src/generated/resources")
protected File schemaOutDir;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
index 0de4ac0b653..e5f2e6d0c64 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
@@ -26,6 +26,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.tooling.util.Strings;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
@@ -149,23 +150,47 @@ public class PrepareComponentMojo extends AbstractGeneratorMojo {
}
}
- // whether to sync pom
- Object val = project.getContextValue("syncPomFile");
- if (val != null) {
- File parent = project.getBasedir().getParentFile();
- File components = findCamelDirectory(project.getBasedir(), "components");
- if (Objects.equals(parent, components)) {
- val = false;
+ // whether to sync pom in allcomponents/parent
+ Object syncComponents = project.getContextValue("syncPomFile");
+ Object syncParent = syncComponents;
+ if (!"false".equals(syncComponents)) {
+ boolean components = isParentArtifact(project, "components");
+ if (components) {
+ syncComponents = "true";
+ } else {
+ syncComponents = "false";
+ }
+ // do not sync parent for core as its handled manual
+ boolean core = isParentArtifact(project, "core");
+ if (core) {
+ syncParent = "false";
+ } else {
+ syncParent = "true";
+ }
+ }
+ if (count > 0) {
+ if ("true".equals(syncParent)) {
+ syncParentPomFile();
+ }
+ if ("true".equals(syncComponents)) {
+ syncAllComponentsPomFile();
}
}
+ }
- // skip from core folder as they are maintained manually in parent and should not be in all-components
- boolean core = project.getParentArtifact() != null && project.getParentArtifact().getArtifactId().equals("core");
- if (!core && count > 0 && (val == null || val.equals("true"))) {
- // Update all component pom sync point
- syncParentPomFile();
- syncAllComponentsPomFile();
+ private static boolean isParentArtifact(MavenProject project, String name) {
+ if (project != null) {
+ Artifact artifact = project.getParentArtifact();
+ if (artifact != null) {
+ if (name.equals(artifact.getArtifactId())) {
+ return true;
+ } else {
+ MavenProject parent = project.getParent();
+ return isParentArtifact(parent, name);
+ }
+ }
}
+ return false;
}
private void syncParentPomFile() throws MojoExecutionException {