chore: sort pom to standard section ordering.

rhusar · Aug 21, 2024 · 53bde99 · 53bde99
1 parent 59a4668
commit 53bde99
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 84 deletions.
diff --git a/clusterbench-common/pom.xml b/clusterbench-common/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>clusterbench</artifactId>
         <groupId>org.jboss.test</groupId>
+        <artifactId>clusterbench</artifactId>
         <version>10.0.1.Final-SNAPSHOT</version>
     </parent>
 

diff --git a/clusterbench-ee10-ear/pom.xml b/clusterbench-ee10-ear/pom.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>clusterbench</artifactId>
         <groupId>org.jboss.test</groupId>
+        <artifactId>clusterbench</artifactId>
         <version>10.0.1.Final-SNAPSHOT</version>
     </parent>
 
@@ -26,6 +24,32 @@
         <wildfly.skip>false</wildfly.skip>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>clusterbench-ee10-ejb</artifactId>
+            <type>ejb</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>clusterbench-ee10-web</artifactId>
+            <classifier>default</classifier>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>clusterbench-ee10-web</artifactId>
+            <classifier>passivating</classifier>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>clusterbench-ee10-web</artifactId>
+            <classifier>granular</classifier>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
     <build>
         <finalName>clusterbench-ee10</finalName>
         <plugins>
@@ -72,40 +96,14 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>clusterbench-ee10-ejb</artifactId>
-            <type>ejb</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>clusterbench-ee10-web</artifactId>
-            <classifier>default</classifier>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>clusterbench-ee10-web</artifactId>
-            <classifier>passivating</classifier>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>clusterbench-ee10-web</artifactId>
-            <classifier>granular</classifier>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-
     <profiles>
         <profile>
             <!-- OpenShift will run the following with extra properties: "mvn -e -Popenshift -DskipTests -B package" -->
             <!-- See https://github.com/wildfly/wildfly-charts/blob/main/charts/wildfly/README.md -->
             <id>openshift</id>
             <build>
-                <finalName>ROOT</finalName>
                 <directory>../target</directory>
+                <finalName>ROOT</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>

diff --git a/clusterbench-ee10-ejb/pom.xml b/clusterbench-ee10-ejb/pom.xml
@@ -3,13 +3,12 @@
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>clusterbench</artifactId>
         <groupId>org.jboss.test</groupId>
+        <artifactId>clusterbench</artifactId>
         <version>10.0.1.Final-SNAPSHOT</version>
     </parent>
 

diff --git a/clusterbench-ee10-web/pom.xml b/clusterbench-ee10-web/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>clusterbench</artifactId>
         <groupId>org.jboss.test</groupId>
+        <artifactId>clusterbench</artifactId>
         <version>10.0.1.Final-SNAPSHOT</version>
     </parent>
 
@@ -112,8 +111,8 @@
                     </execution>
                     <!-- Tomcat variant -->
                     <execution>
-                        <phase>package</phase>
                         <id>build-tomcat-war</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>war</goal>
                         </goals>
@@ -135,8 +134,8 @@
                     </execution>
                     <!-- Build default configuration: session granularity and never passivates. -->
                     <execution>
-                        <phase>package</phase>
                         <id>build-default-war</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>war</goal>
                         </goals>
@@ -163,8 +162,8 @@
                     </execution>
                     <!-- Build passivating configuration: session granularity but passivation enabled. -->
                     <execution>
-                        <phase>package</phase>
                         <id>build-passivating-war</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>war</goal>
                         </goals>
@@ -191,8 +190,8 @@
                     </execution>
                     <!-- Build granular configuration: attribute granularity but never passivates. -->
                     <execution>
-                        <phase>package</phase>
                         <id>build-granular-war</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>war</goal>
                         </goals>
@@ -260,8 +259,8 @@
                             </execution>
                             <!-- Build default configuration: SESSION granularity and never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-default-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -288,8 +287,8 @@
                             </execution>
                             <!-- Build granular configuration: ATTRIBUTE granularity but never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-granular-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -356,8 +355,8 @@
                             </execution>
                             <!-- Build default configuration: SESSION granularity and never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-default-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -384,8 +383,8 @@
                             </execution>
                             <!-- Build granular configuration: ATTRIBUTE granularity but never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-granular-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -456,8 +455,8 @@
                             </execution>
                             <!-- Build default configuration: SESSION granularity and never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-default-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -488,8 +487,8 @@
                             </execution>
                             <!-- Build granular configuration: ATTRIBUTE granularity but never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-granular-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -564,8 +563,8 @@
                             </execution>
                             <!-- Build default configuration: SESSION granularity and never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-default-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>
@@ -596,8 +595,8 @@
                             </execution>
                             <!-- Build granular configuration: ATTRIBUTE granularity but never passivates. -->
                             <execution>
-                                <phase>package</phase>
                                 <id>build-granular-war</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>war</goal>
                                 </goals>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -3,7 +3,6 @@
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,6 +17,11 @@
 
     <name>ClusterBench ITs (parent)</name>
 
+    <modules>
+        <module>tomcat-10.1</module>
+        <module>wildfly</module>
+    </modules>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -37,9 +41,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>tomcat-10.1</module>
-        <module>wildfly</module>
-    </modules>
-
-</project>
+</project>
diff --git a/integration-tests/tomcat-10.1/pom.xml b/integration-tests/tomcat-10.1/pom.xml
@@ -3,7 +3,6 @@
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -61,27 +60,27 @@
     <build>
         <testResources>
             <testResource>
+                <filtering>true</filtering>
                 <directory>src/test/resources</directory>
                 <includes>
                     <include>arquillian.xml</include>
                 </includes>
-                <filtering>true</filtering>
             </testResource>
             <testResource>
-                <directory>src/test/resources/tomcat</directory>
                 <targetPath>${catalina.home}/conf</targetPath>
+                <filtering>true</filtering>
+                <directory>src/test/resources/tomcat</directory>
                 <includes>
                     <include>*</include>
                 </includes>
-                <filtering>true</filtering>
             </testResource>
             <testResource>
+                <filtering>true</filtering>
                 <directory>src/test/java</directory>
                 <includes>
                     <include>**/*.properties</include>
                     <include>**/*.xml</include>
                 </includes>
-                <filtering>true</filtering>
             </testResource>
         </testResources>
         <plugins>
@@ -198,5 +197,4 @@
         </plugins>
     </build>
 
-
-</project>
+</project>
diff --git a/integration-tests/wildfly/pom.xml b/integration-tests/wildfly/pom.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright The ClusterBench Authors
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,8 +34,8 @@
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
                 <version>${version.org.jboss.arquillian}</version>
-                <scope>import</scope>
                 <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -158,15 +156,15 @@
                 <executions>
                     <execution>
                         <id>provision-server-for-testing</id>
+                        <phase>process-test-classes</phase>
                         <goals>
                             <!-- Reference: https://docs.wildfly.org/wildfly-maven-plugin/releases/5.0/package-mojo.html -->
                             <goal>package</goal>
                         </goals>
-                        <phase>process-test-classes</phase>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>