Merge branch 'rel_0_11_1_0'

README.md

@@ -14,7 +14,7 @@ repositories {
 ```
 Add a Gradle compile dependency to the `build.gradle` file of your project:
 ```groovy
-testCompile 'com.github.golovnin:embedded-vault:0.10.3.0'
+testCompile 'com.github.golovnin:embedded-vault:0.11.1.0'
 ```
 
 ### Usage
@@ -49,7 +49,7 @@ process.stop();
 
 ### Supported Vault versions and platforms
 
-Versions: 0.10.3 and any custom
+Versions: 0.11.1 and any custom
 
 Platforms: Mac OS X, FreeBSD, Linux, Solaris and Windows
 

build.gradle

@@ -1,13 +1,14 @@
 plugins {
     id 'com.jfrog.bintray' version '1.8.4'
+    id 'com.github.ben-manes.versions' version '0.20.0'
 }
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 apply plugin: 'java-library-distribution'
 
 ext {
-    productVersion    = '0.10.3.0'
+    productVersion    = '0.11.1.0'
     product           = 'embedded-vault'
     javaTarget        = JavaVersion.VERSION_1_8
     libraries         = [
@@ -31,11 +32,6 @@ version = productVersion
 sourceCompatibility = javaTarget
 targetCompatibility = javaTarget
 
-// Change the output directory for the main source set back to the old path.
-// Remove it when IDEA and Eclipse support new layout.
-sourceSets.main.output.classesDir = new File(buildDir, "classes/main")
-sourceSets.test.output.classesDir = new File(buildDir, "classes/test")
-
 repositories {
     mavenCentral()
 }
@@ -120,5 +116,5 @@ bintray {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.8.1'
+    gradleVersion = '4.10.2'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/github/golovnin/embedded/vault/VaultServerConfig.java

@@ -122,7 +122,7 @@ public static final class Builder extends AbstractBuilder<VaultServerConfig> {
             TypedProperty.with("err-consumer", Consumer.class);
 
         public Builder() {
-            property(VERSION).setDefault(VaultVersion.V0_10_3);
+            property(VERSION).setDefault(VaultVersion.V0_11_1);
             property(STARTUP_TIMEOUT).setDefault(60000L);
             property(LISTENER_HOST).setDefault(DEFAULT_ADDRESS);
             property(LISTENER_PORT).setDefault(8200);

src/main/java/com/github/golovnin/embedded/vault/VaultServerProcess.java

@@ -66,6 +66,7 @@ public final class VaultServerProcess
 
     private static final String UNSEAL_KEY = "Unseal Key:";
 
+    private boolean stopped;
     private File configFile;
     private Consumer<String> outConsumer;
     private Consumer<String> errConsumer;
@@ -151,7 +152,15 @@ protected void onAfterProcessStart(ProcessControl process,
 
     @Override
     protected void stopInternal() {
-        sendKillToProcess();
+        synchronized (this) {
+            if (!stopped) {
+                stopped = true;
+                if (!sendKillToProcess()) {
+                    tryKillToProcess();
+                }
+                stopProcess();
+            }
+        }
     }
 
     @Override

src/main/java/com/github/golovnin/embedded/vault/VaultVersion.java

@@ -55,7 +55,16 @@ public enum VaultVersion implements IVersion {
     @Deprecated
     V0_10_2("0.10.2"),
 
-    V0_10_3("0.10.3");
+    @Deprecated
+    V0_10_3("0.10.3"),
+
+    @Deprecated
+    V0_10_4("0.10.4"),
+
+    @Deprecated
+    V0_11_0("0.11.0"),
+
+    V0_11_1("0.11.1");
 
     private final String version;