merge: #12301

12301: [Backport stable/8.2] 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 <[email protected]>
camunda · Apr 11, 2023 · 0c30137 · 0c30137
2 parents df7b9fa + 359fa5b
commit 0c30137
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 42 deletions.
diff --git a/backup-stores/s3/pom.xml b/backup-stores/s3/pom.xml
@@ -144,12 +144,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -170,7 +164,6 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>
           <ignoredUnusedDeclaredDependencies>
-            <dep>com.amazonaws:aws-java-sdk-core</dep>
             <dep>com.github.luben:zstd-jni</dep>
           </ignoredUnusedDeclaredDependencies>
         </configuration>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -88,7 +88,7 @@
     <version.wiremock>2.35.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.4.0</version.netflix.concurrency>
     <version.zeebe-test-container>3.5.2</version.zeebe-test-container>
     <version.feel-scala>1.16.0</version.feel-scala>
@@ -1007,24 +1007,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.446</version>
-        <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>*</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
       <!-- Dependencies present for convergence only -->
       <!-- between duct-tape (from testcontainers) and kotlin-stdlib (from identity-sdk) -->
       <dependency>

diff --git a/qa/integration-tests/pom.xml b/qa/integration-tests/pom.xml
@@ -263,12 +263,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>

diff --git a/qa/pom.xml b/qa/pom.xml
@@ -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>