This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 4df73d568e HDDS-12106. Enable sortpom in integration-test and
fault-injection-test. (#7734)
4df73d568e is described below
commit 4df73d568eacffa97d4c1d8c39b43ab0c838df39
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Wed Jan 22 14:03:17 2025 +0530
HDDS-12106. Enable sortpom in integration-test and fault-injection-test.
(#7734)
---
.../fault-injection-test/mini-chaos-tests/pom.xml | 33 ++-
.../fault-injection-test/network-tests/pom.xml | 24 +--
hadoop-ozone/fault-injection-test/pom.xml | 15 +-
hadoop-ozone/integration-test/pom.xml | 234 ++++++++++-----------
4 files changed, 140 insertions(+), 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
index 90961941a4..622565a643 100644
--- 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
index 3587491173..7cebddbf09 100644
--- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/network-tests/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>
@@ -23,12 +20,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<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
index 1306013726..ca816165db 100644
--- 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>
diff --git a/hadoop-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index f4e6b73cc6..a7366ff7e5 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-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
-https://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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -24,67 +21,38 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-integration-test</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Integration Tests</description>
- <name>Apache Ozone Integration Tests</name>
<packaging>jar</packaging>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone Integration Tests</name>
+ <description>Apache Ozone Integration Tests</description>
<dependencies>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
+ <artifactId>hdds-tools</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
+ <artifactId>ozone-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
- <version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>ozone-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minikdc</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>ozone-csi</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3gateway</artifactId>
+ <artifactId>ozone-filesystem</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-csi</artifactId>
+ <artifactId>ozone-manager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -92,119 +60,114 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem</artifactId>
+ <artifactId>ozone-s3gateway</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-tools</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>test</scope>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-kms</artifactId>
+ <artifactId>hadoop-distcp</artifactId>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-kms</artifactId>
+ <artifactId>hadoop-distcp</artifactId>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-distcp</artifactId>
+ <artifactId>hadoop-kms</artifactId>
<scope>test</scope>
<exclusions>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-kms</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
@@ -216,38 +179,37 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-distcp</artifactId>
+ <artifactId>hadoop-minikdc</artifactId>
<scope>test</scope>
- <type>test-jar</type>
<exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
@@ -255,22 +217,50 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-server</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-container-service</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
+ <version>${hdds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-scm</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-manager</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
