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 2019/12/05 08:04:17 UTC
[camel-quarkus] branch master updated: chore: Fix pom sorting
script execution (#510)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new fb34e00 chore: Fix pom sorting script execution (#510)
fb34e00 is described below
commit fb34e008a24f24a7e784c260d061fb5864621fef
Author: James Netherton <ja...@users.noreply.github.com>
AuthorDate: Thu Dec 5 08:04:08 2019 +0000
chore: Fix pom sorting script execution (#510)
---
extensions/pom.xml | 4 ++--
integration-tests/pom.xml | 4 ++--
pom.xml | 2 +-
poms/bom/pom.xml | 10 +++++-----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index b670ef5..694ccf3 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -50,6 +50,7 @@
<module>aws-s3</module>
<module>aws-sns</module>
<module>aws-sqs</module>
+ <module>base64</module>
<module>bean</module>
<module>bean-validator</module>
<module>controlbus</module>
@@ -80,6 +81,7 @@
<module>rest</module>
<module>salesforce</module>
<module>scheduler</module>
+ <module>seda</module>
<module>servlet</module>
<module>sjms</module>
<module>sjms2</module>
@@ -93,8 +95,6 @@
<module>vm</module>
<module>xslt</module>
<module>zipfile</module>
- <module>seda</module>
- <module>base64</module>
</modules>
<build>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1bab306..b8223d0 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -111,6 +111,7 @@
<!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
<module>aws</module>
+ <module>base64</module>
<module>bean</module>
<module>bean-validator</module>
<module>controlbus</module>
@@ -138,6 +139,7 @@
<module>platform-http-engine</module>
<module>salesforce</module>
<module>scheduler</module>
+ <module>seda</module>
<module>servlet</module>
<module>sjms</module>
<module>slack</module>
@@ -148,8 +150,6 @@
<module>validator</module>
<module>xslt</module>
<module>zipfile</module>
- <module>seda</module>
- <module>base64</module>
</modules>
<build>
diff --git a/pom.xml b/pom.xml
index d2f353a..2eb5715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,7 +386,7 @@
<goals>
<goal>execute</goal>
</goals>
- <phase>none</phase>
+ <phase>process-resources</phase>
<configuration>
<properties>
<sortModulesPaths>extensions/pom.xml,integration-tests/pom.xml</sortModulesPaths>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index afbae10..3251b90 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -444,6 +444,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-base64</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bean</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
@@ -754,11 +759,6 @@
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-base64</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>