HDDS-12106. Enable sortpom in integration-test and fault-injection-te…

…st. (apache#7734)
dombizita · Jan 22, 2025 · 4df73d5 · 4df73d5
1 parent a0be99a
commit 4df73d5
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 166 deletions.
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -12,21 +12,19 @@
   See the License for the specific language governing permissions and
   limitations under the License. See accompanying LICENSE file.
 -->
-<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">
+<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>ozone-fault-injection-test</artifactId>
     <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone-fault-injection-test</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
+
+  <artifactId>mini-chaos-tests</artifactId>
   <version>2.0.0-SNAPSHOT</version>
-  <description>Apache Ozone Mini Ozone Chaos Tests</description>
   <name>Apache Ozone Mini Ozone Chaos Tests</name>
+  <description>Apache Ozone Mini Ozone Chaos Tests</description>
 
-  <artifactId>mini-chaos-tests</artifactId>
   <dependencies>
     <dependency>
       <groupId>org.apache.ozone</groupId>
@@ -35,30 +33,30 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!-- Test dependencies -->
     <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.ozone</groupId>
-      <artifactId>hdds-test-utils</artifactId>
+      <artifactId>hdds-server-scm</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.ozone</groupId>
-      <artifactId>ozone-integration-test</artifactId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
-      <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>org.apache.ozone</groupId>
-      <artifactId>hdds-server-scm</artifactId>
-      <scope>test</scope>
+      <artifactId>ozone-integration-test</artifactId>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.ozone</groupId>
-      <artifactId>hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -76,8 +74,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
         <configuration>
-          <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
-          </excludeFilterFile>
+          <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
         </configuration>
       </plugin>
     </plugins>

diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
@@ -12,23 +12,21 @@
   See the License for the specific language governing permissions and
   limitations under the License. See accompanying LICENSE file.
 -->
-<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">
+<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>
     <groupId>org.apache.ozone</groupId>
     <artifactId>ozone-fault-injection-test</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>ozone-network-tests</artifactId>
-  <description>Apache Ozone Network Tests</description>
-  <name>Apache Ozone Network Tests</name>
   <packaging>jar</packaging>
+  <name>Apache Ozone Network Tests</name>
+  <description>Apache Ozone Network Tests</description>
 
   <properties>
-    <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so far -->
+    <!-- no tests in this module so far -->
+    <maven.test.skip>true</maven.test.skip>
   </properties>
 
   <build>
@@ -45,10 +43,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <executions>
           <execution>
             <id>copy-resources</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>process-resources</phase>
             <configuration>
               <outputDirectory>${project.build.directory}</outputDirectory>
               <resources>
@@ -81,10 +79,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
             <artifactId>exec-maven-plugin</artifactId>
             <executions>
               <execution>
-                <phase>integration-test</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>integration-test</phase>
                 <configuration>
                   <executable>python</executable>
                   <arguments>
@@ -94,12 +92,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                     <argument>${basedir}/src/test/blockade/</argument>
                   </arguments>
                   <environmentVariables>
-                    <OZONE_HOME>
-                      ${ozone.home}
-                    </OZONE_HOME>
-                    <MAVEN_TEST>
-                      ${project.build.directory}
-                    </MAVEN_TEST>
+                    <OZONE_HOME>${ozone.home}</OZONE_HOME>
+                    <MAVEN_TEST>${project.build.directory}</MAVEN_TEST>
                   </environmentVariables>
                 </configuration>
               </execution>

diff --git a/hadoop-ozone/fault-injection-test/pom.xml b/hadoop-ozone/fault-injection-test/pom.xml
@@ -12,10 +12,7 @@
   See the License for the specific language governing permissions and
   limitations under the License. See accompanying LICENSE file.
 -->
-<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">
+<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>
     <groupId>org.apache.ozone</groupId>
@@ -24,17 +21,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   </parent>
   <artifactId>ozone-fault-injection-test</artifactId>
   <version>2.0.0-SNAPSHOT</version>
-  <description>Apache Ozone Fault Injection Tests</description>
-  <name>Apache Ozone Fault Injection Tests</name>
   <packaging>pom</packaging>
-
-  <properties>
-    <sort.skip>true</sort.skip>
-  </properties>
+  <name>Apache Ozone Fault Injection Tests</name>
+  <description>Apache Ozone Fault Injection Tests</description>
 
   <modules>
-    <module>network-tests</module>
     <module>mini-chaos-tests</module>
+    <module>network-tests</module>
   </modules>
 
   <dependencies>