Resolves build issues relating to Java 8/9+ compatibility. Updates Gradle and various test dependencies to latest versions. Updates README for 4.1.0 release.

Author: steve-perkins-bc

README.md

@@ -5,9 +5,12 @@ HashiCorp.
 
 This driver strives to implement Vault's full HTTP API, along with supporting functionality such as automatic
 retry handling.  It does so without relying on any other external libraries beyond the Java standard library,
-and is compatible with Java 7 and up.  So it will play nice with all of your projects, greenfield and legacy
+and is compatible with Java 8 and up.  So it will play nice with all of your projects, greenfield and legacy
 alike, without causing conflicts with any other dependency.
 
+NOTE:  Although the binary artifact produced by the project is backwards-compatible with Java 8, you do need 
+       JDK 9 or higher to modify or build the source code of this library itself.
+
 Table of Contents
 -----------------
 * [Installing the Driver](#installing-the-driver)
@@ -31,7 +34,7 @@ The driver is available from Maven Central, for all modern Java build systems.
 Gradle:
 ```
 dependencies {
-    implementation 'com.bettercloud:vault-java-driver:4.0.0'
+    implementation 'com.bettercloud:vault-java-driver:4.1.0'
 }
 ```
 
@@ -40,7 +43,7 @@ Maven:
 <dependency>
     <groupId>com.bettercloud</groupId>
     <artifactId>vault-java-driver</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
 </dependency>
 ```
 
@@ -249,11 +252,22 @@ Note that changes to the major version (i.e. the first number) represent possibl
 may require modifications in your code to migrate.  Changes to the minor version (i.e. the second number)
 should represent non-breaking changes.  The third number represents any very minor bugfix patches.
 
+* **4.1.0**:  This release contains the following update:
+  * Support for JWT authentication, for use by Kubernetes and other JWT-based authentication providers.  [(PR #164)](https://github.com/BetterCloud/vault-java-driver/pull/164)
+  * Updates the lease revoke method, to support changes in the underlying Vault API.  [(PR #163)](https://github.com/BetterCloud/vault-java-driver/pull/163)
+  * Changes the `VaultConfig.secretsEnginePathMap(...)` method from default access level to `public`, to allow for manual
+    setting [(PR #164)](https://github.com/BetterCloud/vault-java-driver/pull/156)
+  * Adds the nonce value to `AuthResponse`, to facilitate re-authentication with Vault via AWS.  [(PR #168)](https://github.com/BetterCloud/vault-java-driver/pull/168)
+  * Establishes a `module-info` file, updates the JDK requirement for building this library to Java 9 (although the built 
+    library artifact remains compatible as a dependency in Java 8 projects).  [(PR #165)](https://github.com/BetterCloud/vault-java-driver/pull/165)
+  * Updates Gradle, and various test dependencies to their latest versions.  Integration tests now target Vault 1.1.3.
+  
 * **4.0.0**:  This is a breaking-change release, with two primary updates:
   * Adds support for Version 2 of the Key/Value Secrets Engine.  The driver now assumes that your Vault instance uses Version 2 of the 
     Key/Value Secrets Engine across the board.  To configure this, see the [Key/Value Secret Engine Config](#key-value-secret-engine-config) 
     section above.
   * Adds support for the namespaces feature of Vault Enterprise.
+  
 * **3.1.0**:  Several updates.
   * Adds support for seal-related operations (i.e. `/sys/seal`, `/sys/unseal`, `/sys/seal-status`).
   * Adds support for the AWS auth backend.
@@ -358,6 +372,10 @@ Unit tests are located under the `src/test` directory, and can be run with the G
 Integration tests are located under the `src/test-integration` directory, and can be run with the Gradle
 `integrationTest` task.  See the additional `README.md` file in this directory for more detailed information.
 
+Although this library now includes a `module-info` class for use by Java 9+, the library currently targets 
+Java 8 compatibility.  Please do not attempt to introduce any features or syntax not compatible with Java 8 (the 
+Gradle build script should prevent you from doing so without modification).
+
 License
 -------
 The MIT License (MIT)

build.gradle

@@ -7,54 +7,64 @@ archivesBaseName = 'vault-java-driver'
 version '4.1.0'
 ext.isReleaseVersion = !version.endsWith('SNAPSHOT')
 
-compileJava {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-}
-
-sourceSets {
-    main {
-        java {
-            exclude 'module-info.java'
-        }
-    }
-    mainModuleInfo {
-        java {
-            srcDirs = ['src/main/java']
-            outputDir = file("$buildDir/classes/java/main")
-            include 'module-info.java'
-        }
-    }
-}
-
-classes.dependsOn mainModuleInfoClasses
-compileMainModuleInfoJava.options.compilerArgs.addAll(['--release', '9'])
-
-compileTestJava {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-}
+// This project is actually limited to Java 8 compatibility.  See below.
+sourceCompatibility = 9
+targetCompatibility = 9
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
     testCompile('junit:junit:4.12')
-    testCompile('org.mockito:mockito-core:2.23.4')
-    testCompile('org.testcontainers:testcontainers:1.6.0')
-    testCompile('org.eclipse.jetty:jetty-server:9.4.14.v20181114')
-    testCompile('org.slf4j:slf4j-api:1.7.25')
-    testCompile('org.bouncycastle:bcprov-jdk15on:1.60')
-    testCompile('org.bouncycastle:bcpkix-jdk15on:1.60')
+    testCompile('org.mockito:mockito-core:2.28.2')
+    testCompile('org.testcontainers:testcontainers:1.11.3')
+    testCompile('org.eclipse.jetty:jetty-server:9.4.19.v20190610')
+    testCompile('org.slf4j:slf4j-api:1.7.26')
+    testCompile('org.bouncycastle:bcprov-jdk15on:1.62')
+    testCompile('org.bouncycastle:bcpkix-jdk15on:1.62')
+    testCompile('org.apache.commons:commons-io:1.3.2')
 
-    testRuntime('org.slf4j:slf4j-simple:1.7.25')
+    testRuntime('org.slf4j:slf4j-simple:1.7.26')
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.2'
+// Beginning of Java 9 compatibility config
+//
+// Allowing a library to support Java 9+ modularity, while also maintaining backwards-compatibility for Java 8 users, is WAY more
+// tricky than expected!  The lines below are adapted from a blog article (https://dzone.com/articles/building-java-6-8-libraries-for-jpms-in-gradle),
+// and cause the built classes to support a Java 8 JRE, while also including a module definition suitable for use with Java 9.  There are a
+// few considerations that come with this:
+//
+// * You now need JDK 9 or higher to BUILD this library.  You can still USE the built artifact as a dependency in a Java 8 project.
+// * Although "sourceCompatibility" and "targetCompatability" above are set for Java 9, the "compileJava" settings below will not
+//   allow you to build with any code changes that are not Java 8 compatible.
+// * Unfortunately, IntelliJ (and perhaps other IDE's?) will show syntax highlighting, code completion tips, etc for Java 9.  Sorry for
+//   the inconvenience.  In any case, you should not commit changes to source control without confirming that the project builds.
+compileJava {
+    exclude 'module-info.java'
+
+    options.compilerArgs = ['--release', '8']
+}
+
+task compileModuleInfoJava(type: JavaCompile) {
+    classpath = files()
+    source = 'src/main/java/module-info.java'
+    destinationDir = compileJava.destinationDir
+
+    doFirst {
+        options.compilerArgs = [
+                '--release', '9',
+                '--module-path', compileJava.classpath.asPath,
+        ]
+    }
 }
 
+compileModuleInfoJava.dependsOn compileJava
+classes.dependsOn compileModuleInfoJava
+
+// End of Java 9 compatibility config
+
+
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from javadoc.destinationDir
@@ -65,7 +75,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
-
 //
 // Separate unit tests from integration tests.  See: `src/test-integration/README.md`
 //

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Oct 24 14:22:43 EDT 2017
+#Tue Jun 18 14:17:49 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -38,7 +38,7 @@ public class VaultContainer implements TestRule, TestConstants {
      * Establishes a running Docker container, hosting a Vault server instance.
      */
     public VaultContainer() {
-        container = new GenericContainer("vault:1.0.2")
+        container = new GenericContainer("vault:1.1.3")
                 .withClasspathResourceMapping("/startup.sh", CONTAINER_STARTUP_SCRIPT, BindMode.READ_ONLY)
                 .withClasspathResourceMapping("/config.json", CONTAINER_CONFIG_FILE, BindMode.READ_ONLY)
                 .withClasspathResourceMapping("/libressl.conf", CONTAINER_OPENSSL_CONFIG_FILE, BindMode.READ_ONLY)