Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 17 additions & 0 deletions hadoop-ozone/integration-test-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down