Skip to content

Commit

Permalink
merge: #12300
Browse files Browse the repository at this point in the history
12300: [Backport stable/8.1] deps(maven): bump testcontainers-bom from 1.17.6 to 1.18.0 r=oleschoenburg a=oleschoenburg

Backport of #12251 to get rid of the AWS SDK v1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
  • Loading branch information
3 people authored Apr 6, 2023
2 parents 71b5274 + b4863c8 commit 35de4e0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 55 deletions.
20 changes: 0 additions & 20 deletions backup-stores/s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,31 +133,11 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<dep>com.amazonaws:aws-java-sdk-core</dep>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</build>

</project>
20 changes: 1 addition & 19 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<version.wiremock>2.34.0</version.wiremock>
<version.conscrypt>2.5.2</version.conscrypt>
<version.asm>9.3</version.asm>
<version.testcontainers>1.17.6</version.testcontainers>
<version.testcontainers>1.18.0</version.testcontainers>
<version.netflix.concurrency>0.3.9</version.netflix.concurrency>
<version.zeebe-test-container>3.5.1</version.zeebe-test-container>
<version.feel-scala>1.15.3</version.feel-scala>
Expand Down Expand Up @@ -942,24 +942,6 @@
<scope>import</scope>
</dependency>

<!--
Sad workaround for https://github.com/testcontainers/testcontainers-java/issues/4279; when
this is not needed and removed, make sure to remove it from child modules including this as
well
-->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>1.12.441</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Dependencies present for convergence only -->
<!-- between log4j2 and commons-compress (from testcontainers) -->
<dependency>
Expand Down
6 changes: 0 additions & 6 deletions qa/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.camunda</groupId>
<artifactId>zeebe-protocol-asserts</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions qa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,6 @@
<skip>true</skip>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<dep>com.amazonaws:aws-java-sdk-core</dep>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 35de4e0

Please sign in to comment.