chore: Fix pom sorting script execution (#510)

apache · Dec 5, 2019 · fb34e00 · fb34e00
1 parent 2db85bc
commit fb34e00
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -442,6 +442,11 @@
                 <artifactId>camel-quarkus-aws-sqs</artifactId>
                 <version>${camel-quarkus.version}</version>
             </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>
@@ -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>