From e50b7b92ada301ff69ec5ef48baee0b146af1ac3 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Sat, 4 Apr 2026 13:57:12 +0200
Subject: [PATCH] HDDS-14975. Move awssdk version definition to
 ozone-integration-test-s3

---
 .../mini-chaos-tests/pom.xml                  |  5 ----
 hadoop-ozone/integration-test-s3/pom.xml      | 17 +++++++++++
 .../src/test/resources/log4j.properties       | 30 +++++++++++++++++++
 .../src/test/resources/log4j.properties       |  6 ----
 pom.xml                                       |  8 -----
 5 files changed, 47 insertions(+), 19 deletions(-)
 create mode 100644 hadoop-ozone/integration-test-s3/src/test/resources/log4j.properties

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 03968b3da7ff..2272c64c0f81 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -133,11 +133,6 @@
       <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-ozone/integration-test-s3/pom.xml b/hadoop-ozone/integration-test-s3/pom.xml
index 8ee8d5794576..869ebb9ecf1f 100644
--- a/hadoop-ozone/integration-test-s3/pom.xml
+++ b/hadoop-ozone/integration-test-s3/pom.xml
@@ -25,6 +25,23 @@
   <name>Apache Ozone S3 Integration Tests</name>
   <description>Apache Ozone Integration Tests with S3 Gateway</description>
 
+  <properties>
+    <!-- move to root POM when needed in any other module -->
+    <aws-java-sdk2.version>2.42.23</aws-java-sdk2.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>bom</artifactId>
+        <version>${aws-java-sdk2.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
diff --git a/hadoop-ozone/integration-test-s3/src/test/resources/log4j.properties b/hadoop-ozone/integration-test-s3/src/test/resources/log4j.properties
new file mode 100644
index 000000000000..977e356b7ad3
--- /dev/null
+++ b/hadoop-ozone/integration-test-s3/src/test/resources/log4j.properties
@@ -0,0 +1,30 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+# log4j configuration used during build and unit tests
+
+log4j.rootLogger=info,stdout
+log4j.threshold=ALL
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
+
+log4j.logger.org.apache.hadoop.security.ShellBasedUnixGroupsMapping=ERROR
+log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
+log4j.logger.org.apache.hadoop.hdds.utils.db.managed=TRACE
+log4j.logger.org.apache.hadoop.hdds.utils.db.CodecBuffer=DEBUG
+log4j.logger.org.apache.hadoop.ozone.client.OzoneClientFactory=DEBUG
+
+log4j.logger.com.amazonaws=WARN
+log4j.logger.com.amazonaws.request=DEBUG
+
+log4j.logger.software.amazon.awssdk=WARN
+log4j.logger.software.amazon.awssdk.request=DEBUG
diff --git a/hadoop-ozone/integration-test/src/test/resources/log4j.properties b/hadoop-ozone/integration-test/src/test/resources/log4j.properties
index 977e356b7ad3..c732a15c48a1 100644
--- a/hadoop-ozone/integration-test/src/test/resources/log4j.properties
+++ b/hadoop-ozone/integration-test/src/test/resources/log4j.properties
@@ -22,9 +22,3 @@ log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
 log4j.logger.org.apache.hadoop.hdds.utils.db.managed=TRACE
 log4j.logger.org.apache.hadoop.hdds.utils.db.CodecBuffer=DEBUG
 log4j.logger.org.apache.hadoop.ozone.client.OzoneClientFactory=DEBUG
-
-log4j.logger.com.amazonaws=WARN
-log4j.logger.com.amazonaws.request=DEBUG
-
-log4j.logger.software.amazon.awssdk=WARN
-log4j.logger.software.amazon.awssdk.request=DEBUG
diff --git a/pom.xml b/pom.xml
index 8840172c1c17..981ef4e70bff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
     <aspectj.version>1.9.7</aspectj.version>
     <assertj.version>3.27.7</assertj.version>
     <aws-java-sdk.version>1.12.788</aws-java-sdk.version>
-    <aws-java-sdk2.version>2.42.23</aws-java-sdk2.version>
     <bonecp.version>0.8.0.RELEASE</bonecp.version>
     <bouncycastle.version>1.83</bouncycastle.version>
     <build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
@@ -320,13 +319,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>bom</artifactId>
-        <version>${aws-java-sdk2.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
 
       <dependency>
         <groupId>aopalliance</groupId>