Bump testcontainers to 2.0.2 (#121)

Author: artem-v

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-parent</artifactId>
-    <version>0.3.14</version>
+    <version>0.3.16</version>
   </parent>
 
   <artifactId>scalecube-security-parent</artifactId>
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>vault</artifactId>
+      <artifactId>testcontainers-vault</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

tests/pom.xml

@@ -23,11 +23,6 @@
       <version>${project.parent.version}</version>
     </dependency>
     <!-- Tests -->
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>vault</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.bettercloud</groupId>
       <artifactId>vault-java-driver</artifactId>

tests/src/test/java/io/scalecube/security/environment/VaultEnvironment.java

@@ -1,7 +1,6 @@
 package io.scalecube.security.environment;
 
-import static org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
+import static org.apache.commons.lang3.RandomStringUtils.secure;
 
 import com.bettercloud.vault.json.Json;
 import com.bettercloud.vault.rest.Rest;
@@ -92,8 +91,8 @@ public void createIdentityTokenPolicy(String roleName) {
 
   public String login() {
     try {
-      String username = randomAlphabetic(5);
-      String policy = randomAlphanumeric(10);
+      String username = secure().nextAlphabetic(5);
+      String policy = secure().nextAlphabetic(10);
 
       // add policy
       createIdentityTokenPolicy(policy);
@@ -131,7 +130,7 @@ public static void checkSuccess(int exitCode) {
   }
 
   public String createIdentityKey() {
-    String keyName = randomAlphanumeric(10);
+    String keyName = secure().nextAlphabetic(10);
 
     int status;
     try {
@@ -162,7 +161,7 @@ public String createIdentityKey() {
   }
 
   public String createIdentityRole(String keyName) {
-    String roleName = randomAlphanumeric(10);
+    String roleName = secure().nextAlphabetic(10);
 
     int status;
     try {

tests/src/test/java/io/scalecube/security/vault/VaultServiceTokenTests.java

@@ -2,12 +2,12 @@
 
 import static io.scalecube.security.environment.VaultEnvironment.getRootCause;
 import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.apache.commons.lang3.RandomStringUtils.secure;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringStartsWith.startsWith;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import io.scalecube.security.environment.IntegrationEnvironmentFixture;
 import io.scalecube.security.environment.VaultEnvironment;
@@ -32,8 +32,8 @@ void testGetServiceTokenUsingWrongCredentials(VaultEnvironment vaultEnvironment)
     final var serviceTokenSupplier =
         VaultServiceTokenSupplier.builder()
             .vaultAddress(vaultEnvironment.vaultAddr())
-            .vaultTokenSupplier(() -> completedFuture(randomAlphabetic(16)))
-            .serviceRole(randomAlphabetic(16))
+            .vaultTokenSupplier(() -> completedFuture(secure().nextAlphabetic(16)))
+            .serviceRole(secure().nextAlphabetic(16))
             .serviceTokenNameBuilder((role, attributes) -> role)
             .build();
 
@@ -141,7 +141,8 @@ void testGetServiceTokenSuccessfully(VaultEnvironment vaultEnvironment) throws E
     // Verify serviceToken
 
     final var jwtToken =
-        new Auth0JwtTokenResolver(JwksKeyProvider.builder().jwksUri(vaultEnvironment.jwksUri()).build())
+        new Auth0JwtTokenResolver(
+                JwksKeyProvider.builder().jwksUri(vaultEnvironment.jwksUri()).build())
             .resolveToken(serviceToken)
             .get(3, TimeUnit.SECONDS);