Updates dependencies to latest versions

BetterCloud · Oct 24, 2017 · b06b6a3 · b06b6a3
1 parent b8e0e56
commit b06b6a3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ build
 build.gradle
 classes
 ssl/
+node_modules/
+
diff --git a/build.gradle b/build.gradle
@@ -22,19 +22,19 @@ repositories {
 }
 
 dependencies {
-    compileOnly('org.projectlombok:lombok:1.16.16')
+    compileOnly('org.projectlombok:lombok:1.16.18')
 
-    testCompile('junit:junit:4.11')
-    testCompile('org.mockito:mockito-core:1.10.19')
-    testCompile('org.testcontainers:testcontainers:1.3.0')
-    testCompile('org.eclipse.jetty:jetty-server:9.3.7.v20160115')
+    testCompile('junit:junit:4.12')
+    testCompile('org.mockito:mockito-core:2.11.0')
+    testCompile('org.testcontainers:testcontainers:1.4.3')
+    testCompile('org.eclipse.jetty:jetty-server:9.3.21.v20170918')
     testCompile('org.slf4j:slf4j-api:1.7.25')
 
     testRuntime('org.slf4j:slf4j-simple:1.7.25')
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.0'
+    gradleVersion = '4.2.1'
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 30 18:26:41 EDT 2017
+#Tue Oct 24 14:22:43 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
diff --git a/gradlew b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

diff --git a/src/test-integration/java/com/bettercloud/vault/api/VaultContainer.java b/src/test-integration/java/com/bettercloud/vault/api/VaultContainer.java
@@ -15,6 +15,7 @@
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.Wait;
 import org.testcontainers.shaded.org.bouncycastle.asn1.x500.X500Name;
 import org.testcontainers.shaded.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.testcontainers.shaded.org.bouncycastle.asn1.x509.Extension;
@@ -102,7 +103,7 @@ public VaultContainer() {
         }
 
         // Start Docker container
-        this.container = new GenericContainer("vault:0.7.3")
+        this.container = new GenericContainer("vault:0.8.3")
                 .withClasspathResourceMapping("/config.json", CONTAINER_CONFIG_FILE, BindMode.READ_ONLY)
                 .withFileSystemBind(SSL_DIRECTORY, CONTAINER_SSL_DIRECTORY, BindMode.READ_ONLY)
                 .withCreateContainerCmdModifier(new Consumer<CreateContainerCmd>() {
@@ -113,7 +114,8 @@ public void accept(final CreateContainerCmd createContainerCmd) {
                     }
                 })
                 .withNetworkMode("host")  // .withExposedPorts(8200)
-                .withCommand("vault", "server", "-config", CONTAINER_CONFIG_FILE);
+                .withCommand("vault", "server", "-config", CONTAINER_CONFIG_FILE)
+                .waitingFor(Wait.forListeningPort());
     }
 
     /**