Sort poms using the CQ plugin instead of a groovy script

apache · Mar 18, 2020 · 2e07491 · 2e07491
1 parent 9bfe8e8
commit 2e07491
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 315 deletions.
diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml
@@ -32,6 +32,7 @@
     <packaging>pom</packaging>
 
     <modules>
+        <!-- extensions a..z; do not remove this comment, it is important when sorting via  mvn process-resources -Pformat -->
         <module>ahc</module>
         <module>aws</module>
         <module>common</module>

diff --git a/pom.xml b/pom.xml
@@ -482,23 +482,52 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
+                        <groupId>org.l2x6.cq</groupId>
+                        <artifactId>cq-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>sort-poms</id>
                                 <inherited>false</inherited>
                                 <goals>
-                                    <goal>execute</goal>
+                                    <goal>format</goal>
                                 </goals>
                                 <phase>process-resources</phase>
                                 <configuration>
-                                    <properties>
-                                        <sortModulesPaths>extensions/pom.xml,integration-tests/pom.xml</sortModulesPaths>
-                                        <sortDependencyManagementPaths>poms/bom/pom.xml,poms/bom-deployment/pom.xml</sortDependencyManagementPaths>
-                                        <updateMvndRuleDirs>examples,integration-tests</updateMvndRuleDirs>
-                                    </properties>
-                                    <source>file:///${project.basedir}/tooling/scripts/sort-poms.groovy</source>
+                                    <sortModulesPaths>
+                                        <sortModulesPath>extensions/pom.xml</sortModulesPath>
+                                        <sortModulesPath>extensions-jvm/pom.xml</sortModulesPath>
+                                        <sortModulesPath>integration-tests/pom.xml</sortModulesPath>
+                                    </sortModulesPaths>
+                                    <sortDependencyManagementPaths>
+                                        <sortDependencyManagementPath>poms/bom/pom.xml</sortDependencyManagementPath>
+                                        <sortDependencyManagementPath>poms/bom-deployment/pom.xml</sortDependencyManagementPath>
+                                    </sortDependencyManagementPaths>
+                                    <updateMvndRuleDirs>
+                                        <updateMvndRuleDir>examples</updateMvndRuleDir>
+                                        <updateMvndRuleDir>integration-tests</updateMvndRuleDir>
+                                    </updateMvndRuleDirs>
+                                    <extensionDirs>
+                                        <extensionDir>
+                                            <path>extensions</path>
+                                            <artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
+                                        </extensionDir>
+                                        <extensionDir>
+                                            <path>extensions-core</path>
+                                            <artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
+                                        </extensionDir>
+                                        <extensionDir>
+                                            <path>extensions-jvm</path>
+                                            <artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
+                                        </extensionDir>
+                                        <extensionDir>
+                                            <path>extensions-support</path>
+                                            <artifactIdPrefix>camel-quarkus-support-</artifactIdPrefix>
+                                        </extensionDir>
+                                        <extensionDir>
+                                            <path>integration-tests/support</path>
+                                            <artifactIdPrefix>camel-quarkus-integration-test-support-</artifactIdPrefix>
+                                        </extensionDir>
+                                    </extensionDirs>
                                 </configuration>
                             </execution>
                         </executions>

diff --git a/tooling/scripts/sort-poms.groovy b/tooling/scripts/sort-poms.groovy