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 2021/12/21 09:42:33 UTC
[camel] 03/04: CAMEL-17192: Move camel-allcomponents into catalog folder
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 5ad3a5a06416fec89c6abb69ca1b34da0ac22ad6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 10:12:45 2021 +0100
CAMEL-17192: Move camel-allcomponents into catalog folder
---
{core => catalog}/camel-allcomponents/pom.xml | 2 +-
catalog/pom.xml | 2 ++
core/pom.xml | 2 --
.../main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java | 2 +-
.../java/org/apache/camel/maven/packaging/PrepareComponentMojo.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
similarity index 99%
rename from core/camel-allcomponents/pom.xml
rename to catalog/camel-allcomponents/pom.xml
index 35136bb..6579acc 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
- <artifactId>core</artifactId>
+ <artifactId>catalog</artifactId>
<version>3.15.0-SNAPSHOT</version>
</parent>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 2a1c3ad..aa6d09e 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -34,6 +34,8 @@
<packaging>pom</packaging>
<modules>
+ <!-- sync so all components are built first -->
+ <module>camel-allcomponents</module>
<!-- dummy used for testing catalog -->
<module>dummy-component</module>
<!-- catalog -->
diff --git a/core/pom.xml b/core/pom.xml
index b321dd9..e56d05f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -57,8 +57,6 @@
<module>camel-cloud</module>
<module>camel-health</module>
<module>camel-main</module>
- <!-- TODO: move allcomponents to DSL -->
- <module>camel-allcomponents</module>
</modules>
<properties>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java
index 5b0b446..a9a6009 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java
@@ -63,7 +63,7 @@ public class PrepareAssemblyMojo extends AbstractMojo {
/**
* The directory for components
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-allcomponents/pom.xml")
+ @Parameter(defaultValue = "${project.build.directory}/../../../catalog/camel-allcomponents/pom.xml")
protected File allComponentsPomFile;
/**
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 eeb062c..0de4ac0 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
@@ -211,7 +211,7 @@ public class PrepareComponentMojo extends AbstractGeneratorMojo {
}
private void syncAllComponentsPomFile() throws MojoExecutionException {
- Path root = findCamelDirectory(project.getBasedir(), "core/camel-allcomponents").toPath();
+ Path root = findCamelDirectory(project.getBasedir(), "catalog/camel-allcomponents").toPath();
Path pomFile = root.resolve("pom.xml");
final String startDependenciesMarker = "<dependencies>";