knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject [knox] 21/22: KNOX-2181 - Upgrade testcontainers to 1.12.4
Date Tue, 14 Jan 2020 01:08:09 GMT
This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git

commit 9cc0fa97e72941023065148883aa9098ece58e71
Author: Kevin Risden <krisden@apache.org>
AuthorDate: Mon Jan 13 19:17:06 2020 -0500

    KNOX-2181 - Upgrade testcontainers to 1.12.4
    
    Signed-off-by: Kevin Risden <krisden@apache.org>
---
 .../vault/TestHashicorpVaultAliasService.java         | 19 ++++++++++---------
 pom.xml                                               |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
b/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
index 5604a35..3acf449 100644
--- a/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
+++ b/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
@@ -56,7 +56,7 @@ import static org.junit.Assume.assumeNoException;
 public class TestHashicorpVaultAliasService {
   private static final Logger LOG = LoggerFactory.getLogger(TestHashicorpVaultAliasService.class);
 
-  private static final String vaultVersion = "1.2.1";
+  private static final String vaultVersion = "1.3.1";
   private static final String vaultImage = "vault:" + vaultVersion;
   private static final Integer vaultPort = 8200;
   private static final String vaultToken = "myroot";
@@ -72,17 +72,18 @@ public class TestHashicorpVaultAliasService {
                            .withVaultToken(vaultToken)
                            .waitingFor(Wait.forListeningPort());
       vaultContainer.addExposedPort(vaultPort);
+
+      vaultContainer.start();
+
+      vaultAddress = String.format(Locale.ROOT,
+          "http://%s:%s",
+          vaultContainer.getContainerIpAddress(),
+          vaultContainer.getMappedPort(vaultPort));
+
+      assertTrue(vaultContainer.isRunning());
     } catch (Exception e) {
       assumeNoException(e);
     }
-
-    vaultContainer.start();
-    vaultAddress = String.format(Locale.ROOT,
-        "http://%s:%s",
-        vaultContainer.getContainerIpAddress(),
-        vaultContainer.getMappedPort(vaultPort));
-
-    assertTrue(vaultContainer.isRunning());
   }
 
   @Before
diff --git a/pom.xml b/pom.xml
index 23b0050..837ae11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,7 @@
         <spring-vault.version>2.2.0.RELEASE</spring-vault.version>
         <stax2-api.version>4.2</stax2-api.version>
         <taglibs-standard.version>1.2.5</taglibs-standard.version>
-        <testcontainers.version>1.12.3</testcontainers.version>
+        <testcontainers.version>1.12.4</testcontainers.version>
         <txw2.version>2.4.0-b180830.0438</txw2.version>
         <velocity.version>1.7</velocity.version>
         <woodstox-core.version>6.0.2</woodstox-core.version>


Mime
View raw message