Skip to content

Commit 93bf1d9

Browse files
authored
HDDS-14975. Move awssdk version definition to ozone-integration-test-s3 (#10042)
1 parent c0d50fe commit 93bf1d9

5 files changed

Lines changed: 47 additions & 19 deletions

File tree

hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
<artifactId>slf4j-api</artifactId>
134134
<scope>test</scope>
135135
</dependency>
136-
<dependency>
137-
<groupId>software.amazon.awssdk</groupId>
138-
<artifactId>s3</artifactId>
139-
<scope>test</scope>
140-
</dependency>
141136
</dependencies>
142137

143138
<build>

hadoop-ozone/integration-test-s3/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,23 @@
2525
<name>Apache Ozone S3 Integration Tests</name>
2626
<description>Apache Ozone Integration Tests with S3 Gateway</description>
2727

28+
<properties>
29+
<!-- move to root POM when needed in any other module -->
30+
<aws-java-sdk2.version>2.42.23</aws-java-sdk2.version>
31+
</properties>
32+
33+
<dependencyManagement>
34+
<dependencies>
35+
<dependency>
36+
<groupId>software.amazon.awssdk</groupId>
37+
<artifactId>bom</artifactId>
38+
<version>${aws-java-sdk2.version}</version>
39+
<type>pom</type>
40+
<scope>import</scope>
41+
</dependency>
42+
</dependencies>
43+
</dependencyManagement>
44+
2845
<dependencies>
2946
<dependency>
3047
<groupId>com.amazonaws</groupId>
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Licensed under the Apache License, Version 2.0 (the "License");
2+
# you may not use this file except in compliance with the License.
3+
# You may obtain a copy of the License at
4+
#
5+
# http://www.apache.org/licenses/LICENSE-2.0
6+
#
7+
# Unless required by applicable law or agreed to in writing, software
8+
# distributed under the License is distributed on an "AS IS" BASIS,
9+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
# See the License for the specific language governing permissions and
11+
# limitations under the License.
12+
# log4j configuration used during build and unit tests
13+
14+
log4j.rootLogger=info,stdout
15+
log4j.threshold=ALL
16+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
17+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
18+
log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
19+
20+
log4j.logger.org.apache.hadoop.security.ShellBasedUnixGroupsMapping=ERROR
21+
log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
22+
log4j.logger.org.apache.hadoop.hdds.utils.db.managed=TRACE
23+
log4j.logger.org.apache.hadoop.hdds.utils.db.CodecBuffer=DEBUG
24+
log4j.logger.org.apache.hadoop.ozone.client.OzoneClientFactory=DEBUG
25+
26+
log4j.logger.com.amazonaws=WARN
27+
log4j.logger.com.amazonaws.request=DEBUG
28+
29+
log4j.logger.software.amazon.awssdk=WARN
30+
log4j.logger.software.amazon.awssdk.request=DEBUG

hadoop-ozone/integration-test/src/test/resources/log4j.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,3 @@ log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
2222
log4j.logger.org.apache.hadoop.hdds.utils.db.managed=TRACE
2323
log4j.logger.org.apache.hadoop.hdds.utils.db.CodecBuffer=DEBUG
2424
log4j.logger.org.apache.hadoop.ozone.client.OzoneClientFactory=DEBUG
25-
26-
log4j.logger.com.amazonaws=WARN
27-
log4j.logger.com.amazonaws.request=DEBUG
28-
29-
log4j.logger.software.amazon.awssdk=WARN
30-
log4j.logger.software.amazon.awssdk.request=DEBUG

pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<aspectj.version>1.9.7</aspectj.version>
4141
<assertj.version>3.27.7</assertj.version>
4242
<aws-java-sdk.version>1.12.788</aws-java-sdk.version>
43-
<aws-java-sdk2.version>2.42.23</aws-java-sdk2.version>
4443
<bonecp.version>0.8.0.RELEASE</bonecp.version>
4544
<bouncycastle.version>1.83</bouncycastle.version>
4645
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
@@ -320,13 +319,6 @@
320319
<type>pom</type>
321320
<scope>import</scope>
322321
</dependency>
323-
<dependency>
324-
<groupId>software.amazon.awssdk</groupId>
325-
<artifactId>bom</artifactId>
326-
<version>${aws-java-sdk2.version}</version>
327-
<type>pom</type>
328-
<scope>import</scope>
329-
</dependency>
330322

331323
<dependency>
332324
<groupId>aopalliance</groupId>

0 commit comments

Comments
 (0)