Bump version to 0.7.1

Added automatic module name for JPMS compatibility
Test against 0.9.5
2018-03-17 14:01:55 +01:00 · 2018-03-15 19:54:18 +01:00 · 2018-02-27 18:07:23 +01:00 · 2018-02-24 10:58:45 +01:00 · 2018-02-20 19:25:44 +01:00 · 2018-02-20 19:25:07 +01:00
55 changed files with 316 additions and 165 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,9 +14,10 @@ addons:
 env:
  - PATH=$PATH:.
 before_script:
-  - wget https://releases.hashicorp.com/vault/0.8.3/vault_0.8.3_linux_amd64.zip
-  - unzip vault_0.8.3_linux_amd64.zip
-  - rm vault_0.8.3_linux_amd64.zip
+  - wget https://releases.hashicorp.com/vault/0.9.5/vault_0.9.5_linux_amd64.zip
+  - wget -q -O - https://releases.hashicorp.com/vault/0.9.5/vault_0.9.5_SHA256SUMS | grep linux_amd64 | sha256sum -c
+  - unzip vault_0.9.5_linux_amd64.zip
+  - rm vault_0.9.5_linux_amd64.zip
 cache:
  directories:
    - '$HOME/.m2/repository'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,8 @@
+## 0.7.1 [2018-03-17]
+* [improvement] Added automatic module name for JPMS compatibility
+* [dependencies] Minor dependency updates
+* [test] Tested against Vault 0.9.5
+
 ## 0.7.0 [2017-10-03]
 * [feature] Retrieval of health status via `getHealth()` (#15)
 * [improvement] `seal()`, `unseal()` are now `void` and throw Exception on error (#12)
--- a/README.md
+++ b/README.md
@ -31,7 +31,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
    * Raw secret content or JSON decoding
    * SQL secret handling
 * Connector Factory with builder pattern
-* Tested against Vault 0.8.3
+* Tested against Vault 0.9.5


 ## Maven Artifact
@ -39,7 +39,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
 <dependency>
    <groupId>de.stklcode.jvault</groupId>
    <artifactId>connector</artifactId>
-    <version>0.7.0</version>
+    <version>0.7.1</version>
 </dependency>
 ```

--- a/pom.xml
+++ b/pom.xml
@ -4,7 +4,7 @@

    <groupId>de.stklcode.jvault</groupId>
    <artifactId>connector</artifactId>
-    <version>0.7.0</version>
+    <version>0.7.1</version>

    <packaging>jar</packaging>

@ -52,6 +52,13 @@
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-jar-plugin</artifactId>
                    <version>3.0.2</version>
+                    <configuration>
+                        <archive>
+                            <manifestEntries>
+                                <Automatic-Module-Name>de.stklcode.jvault.connector</Automatic-Module-Name>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
@ -61,7 +68,14 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20.1</version>
+                    <version>2.19.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.junit.platform</groupId>
+                            <artifactId>junit-platform-surefire-provider</artifactId>
+                            <version>1.1.0</version>
+                        </dependency>
+                    </dependencies>
                </plugin>
            </plugins>
        </pluginManagement>
@ -71,30 +85,35 @@
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpcore</artifactId>
-            <version>4.4.7</version>
+            <version>4.4.9</version>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
+            <version>4.5.5</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
-            <version>2.9.1</version>
+            <version>2.9.4</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.9.1</version>
+            <version>2.9.4</version>
        </dependency>

        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.1.0</version>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <version>5.1.0</version>
+        </dependency>
        <dependency>
            <groupId>org.hamcrest</groupId>
            <artifactId>hamcrest-junit</artifactId>
@ -104,19 +123,25 @@
        <dependency>
            <groupId>com.github.stefanbirkner</groupId>
            <artifactId>system-rules</artifactId>
-            <version>1.16.1</version>
+            <version>1.17.1</version>
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.7.3</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.15.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.7.3</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>2.15.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
--- a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
+++ b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/VaultConnector.java
+++ b/src/main/java/de/stklcode/jvault/connector/VaultConnector.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/AuthorizationRequiredException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/AuthorizationRequiredException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/ConnectionException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/ConnectionException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/InvalidRequestException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/InvalidRequestException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/InvalidResponseException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/InvalidResponseException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/PermissionDeniedException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/PermissionDeniedException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/TlsException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/TlsException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/exception/VaultConnectorException.java
+++ b/src/main/java/de/stklcode/jvault/connector/exception/VaultConnectorException.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/factory/HTTPVaultConnectorFactory.java
+++ b/src/main/java/de/stklcode/jvault/connector/factory/HTTPVaultConnectorFactory.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/factory/VaultConnectorFactory.java
+++ b/src/main/java/de/stklcode/jvault/connector/factory/VaultConnectorFactory.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/AuthBackend.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/AuthBackend.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/Token.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/Token.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/TokenBuilder.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/TokenBuilder.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/AuthResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/AuthResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/CredentialsResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/CredentialsResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/ErrorResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/ErrorResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/HelpResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/HelpResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/RawDataResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/RawDataResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/SealResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/SealResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/SecretListResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/SecretListResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/SecretResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/SecretResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/TokenResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/TokenResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/VaultResponse.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/VaultResponse.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthMethod.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthMethod.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -20,6 +20,9 @@ import de.stklcode.jvault.connector.exception.InvalidRequestException;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
 import de.stklcode.jvault.connector.exception.PermissionDeniedException;
 import de.stklcode.jvault.connector.exception.VaultConnectorException;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.agent.ByteBuddyAgent;
+import net.bytebuddy.dynamic.loading.ClassReloadingStrategy;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.entity.ContentType;
@ -27,12 +30,9 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicStatusLine;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@ -40,13 +40,15 @@ import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collections;

+import static net.bytebuddy.implementation.MethodDelegation.to;
+import static net.bytebuddy.matcher.ElementMatchers.named;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.powermock.api.mockito.PowerMockito.*;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;

 /**
 * JUnit test for HTTP Vault connector.
@ -55,20 +57,46 @@ import static org.powermock.api.mockito.PowerMockito.*;
 * @author Stefan Kalscheuer
 * @since 0.7.0
 */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({HttpClientBuilder.class})
-@PowerMockIgnore({"javax.net.ssl.*"})
 public class HTTPVaultConnectorOfflineTest {
    private static final String INVALID_URL = "foo:/\\1nv4l1d_UrL";

-    @Mock
-    private HttpClientBuilder httpMockBuilder;
+    private static HttpClientBuilder httpMockBuilder = mock(HttpClientBuilder.class);
+    private static CloseableHttpClient httpMock = mock(CloseableHttpClient.class);
+    private CloseableHttpResponse responseMock = mock(CloseableHttpResponse.class);

-    @Mock
-    private CloseableHttpClient httpMock;
+    @BeforeAll
+    public static void initByteBuddy() {
+        // Install ByteBuddy Agent.
+        ByteBuddyAgent.install();
+    }

-    @Mock
-    private CloseableHttpResponse responseMock;
+    /**
+     * Helper method for redefinition of {@link HttpClientBuilder#create()} from {@link #initHttpMock()}.
+     *
+     * @return Mocked HTTP client builder.
+     */
+    public static HttpClientBuilder create() {
+        return httpMockBuilder;
+    }
+
+    @BeforeEach
+    public void initHttpMock() {
+        // Redefine static method to return Mock on HttpClientBuilder creation.
+        new ByteBuddy().redefine(HttpClientBuilder.class)
+                .method(named("create"))
+                .intercept(to(HTTPVaultConnectorOfflineTest.class))
+                .make()
+                .load(HttpClientBuilder.class.getClassLoader(), ClassReloadingStrategy.fromInstalledAgent());
+
+        // Ignore SSL context settings.
+        when(httpMockBuilder.setSSLContext(null)).thenReturn(httpMockBuilder);
+
+        // Re-initialize HTTP mock to ensure fresh (empty) results.
+        httpMock = mock(CloseableHttpClient.class);
+
+        // Mock actual client creation.
+        when(httpMockBuilder.build()).thenReturn(httpMock);
+    }

    /**
     * Test exceptions thrown during request.
@ -78,7 +106,6 @@ public class HTTPVaultConnectorOfflineTest {
        HTTPVaultConnector connector = new HTTPVaultConnector("http://127.0.0.1", null, 0, 250);

        // Test invalid response code.
-        initHttpMock();
        final int responseCode = 400;
        mockResponse(responseCode, "", ContentType.APPLICATION_JSON);
        try {
@ -187,7 +214,7 @@ public class HTTPVaultConnectorOfflineTest {
        connector = new HTTPVaultConnector("https://127.0.0.1", null, 0, 250);

        // Simulate NULL response (mock not supplied with data).
-        initHttpMock();
+
        try {
            connector.sealStatus();
            fail("Querying seal status succeeded on invalid instance");
@ -214,7 +241,6 @@ public class HTTPVaultConnectorOfflineTest {
        connector = new HTTPVaultConnector("https://127.0.0.1", null, 0, 250);

        // Simulate NULL response (mock not supplied with data).
-        initHttpMock();
        try {
            connector.getHealth();
            fail("Querying health status succeeded on invalid instance");
@ -233,7 +259,6 @@ public class HTTPVaultConnectorOfflineTest {
        // Mock authorization.
        setPrivate(connector, "authorized", true);
        // Mock response.
-        initHttpMock();
        mockResponse(200, "invalid", ContentType.APPLICATION_JSON);

        // Now test the methods.
@ -357,7 +382,6 @@ public class HTTPVaultConnectorOfflineTest {
        // Mock authorization.
        setPrivate(connector, "authorized", true);
        // Mock response.
-        initHttpMock();
        mockResponse(200, "{}", ContentType.APPLICATION_JSON);

        // Now test the methods expecting a 204.
@ -451,13 +475,6 @@ public class HTTPVaultConnectorOfflineTest {
        }
    }

-    private void initHttpMock() {
-        mockStatic(HttpClientBuilder.class);
-        when(HttpClientBuilder.create()).thenReturn(httpMockBuilder);
-        when(httpMockBuilder.setSSLContext(null)).thenReturn(httpMockBuilder);
-        when(httpMockBuilder.build()).thenReturn(httpMock);
-    }
-
    private void mockResponse(int status, String body, ContentType type) throws IOException {
        when(httpMock.execute(any())).thenReturn(responseMock);
        when(responseMock.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), status, ""));
--- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -17,15 +17,16 @@
 package de.stklcode.jvault.connector;

 import de.stklcode.jvault.connector.exception.*;
+import de.stklcode.jvault.connector.factory.HTTPVaultConnectorFactory;
+import de.stklcode.jvault.connector.factory.VaultConnectorFactory;
 import de.stklcode.jvault.connector.model.*;
 import de.stklcode.jvault.connector.model.response.*;
-import de.stklcode.jvault.connector.factory.HTTPVaultConnectorFactory;
 import de.stklcode.jvault.connector.test.Credentials;
 import de.stklcode.jvault.connector.test.VaultConfiguration;
-import de.stklcode.jvault.connector.factory.VaultConnectorFactory;
-import org.junit.*;
+import org.junit.Rule;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
 import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;

 import java.io.*;
 import java.lang.reflect.Field;
@ -34,11 +35,17 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;

+import static org.apache.commons.io.FileUtils.copyDirectory;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.hamcrest.junit.MatcherAssume.assumeThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;

 /**
 * JUnit test for HTTP Vault connector.
@ -47,8 +54,9 @@ import static org.junit.Assume.*;
 * @author Stefan Kalscheuer
 * @since 0.1
 */
+@EnableRuleMigrationSupport
 public class HTTPVaultConnectorTest {
-    private static final String VAULT_VERISON = "0.8.3";  // the vault version this test is supposed to run against
+    private static final String VAULT_VERISON = "0.9.5";  // the vault version this test is supposed to run against
    private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61";
    private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7";
    private static final String USER_VALID = "validUser";
@ -73,22 +81,19 @@ public class HTTPVaultConnectorTest {
    @Rule
    public TemporaryFolder tmpDir = new TemporaryFolder();

-    @Rule
-    public TestName testName = new TestName();
-
    /**
     * Initialize Vault instance with generated configuration and provided file backend.
     * Requires "vault" binary to be in current user's executable path. Not using MLock, so no extended rights required.
     */
-    @Before
-    public void setUp() throws VaultConnectorException {
+    @BeforeEach
+    public void setUp(TestInfo testInfo) throws VaultConnectorException, IOException {
        /* Determine, if TLS is required */
-        boolean isTls = testName.getMethodName().equals("tlsConnectionTest");
+        boolean isTls = testInfo.getTags().contains("tls");

        /* Initialize Vault */
        VaultConfiguration config = initializeVault(isTls);
        try {
-            Thread.sleep(1000);
+            TimeUnit.SECONDS.sleep(1);
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
@ -104,11 +109,11 @@ public class HTTPVaultConnectorTest {

        /* Unseal Vault and check result */
        SealResponse sealStatus = connector.unseal(KEY);
-        assumeNotNull(sealStatus);
+        assumeTrue(sealStatus != null);
        assumeFalse(sealStatus.isSealed());
    }

-    @After
+    @AfterEach
    public void tearDown() {
        if (vaultProcess != null && vaultProcess.isAlive())
            vaultProcess.destroy();
@ -217,7 +222,7 @@ public class HTTPVaultConnectorTest {

        try {
            res = connector.authToken(TOKEN_ROOT);
-            assertNotNull("Login failed with valid token", res);
+            assertNotNull(res, "Login failed with valid token");
            assertThat("Login failed with valid token", connector.isAuthorized(), is(true));
        } catch (VaultConnectorException ignored) {
            fail("Login failed with valid token");
@ -246,7 +251,7 @@ public class HTTPVaultConnectorTest {
        } catch (VaultConnectorException ignored) {
            fail("Login failed with valid credentials: Exception thrown");
        }
-        assertNotNull("Login failed with valid credentials: Response not available", res.getAuth());
+        assertNotNull(res.getAuth(), "Login failed with valid credentials: Response not available");
        assertThat("Login failed with valid credentials: Connector not authorized", connector.isAuthorized(), is(true));
    }

@ -636,6 +641,7 @@ public class HTTPVaultConnectorTest {
     * Test reading of secrets.
     */
    @Test
+    @SuppressWarnings("deprecation")
    public void readSecretTest() {
        authUser();
        assumeTrue(connector.isAuthorized());
@ -728,6 +734,7 @@ public class HTTPVaultConnectorTest {
     * Test writing secrets.
     */
    @Test
+    @SuppressWarnings("deprecation")
    public void writeSecretTest() {
        authUser();
        assumeTrue(connector.isAuthorized());
@ -899,7 +906,7 @@ public class HTTPVaultConnectorTest {
            fail("Overwriting token should fail as of Vault 0.8.0");
        } catch (VaultConnectorException e) {
            assertThat(e, is(instanceOf(InvalidResponseException.class)));
-            assertThat(((InvalidResponseException)e).getStatusCode(), is(400));
+            assertThat(((InvalidResponseException) e).getStatusCode(), is(400));
            /* Assert that the exception does not reveal token ID */
            assertThat(stackTrace(e), not(stringContainsInOrder(token.getId())));
        }
@ -909,6 +916,7 @@ public class HTTPVaultConnectorTest {
     * Test TLS connection with custom certificate chain.
     */
    @Test
+    @Tag("tls")
    public void tlsConnectionTest() {
        TokenResponse res;
        try {
@ -919,7 +927,7 @@ public class HTTPVaultConnectorTest {

        try {
            res = connector.authToken(TOKEN_ROOT);
-            assertNotNull("Login failed with valid token", res);
+            assertNotNull(res, "Login failed with valid token");
            assertThat("Login failed with valid token", connector.isAuthorized(), is(true));
        } catch (VaultConnectorException ignored) {
            fail("Login failed with valid token");
@ -954,14 +962,15 @@ public class HTTPVaultConnectorTest {
     * @return Vault Configuration
     * @throws IllegalStateException on error
     */
-    private VaultConfiguration initializeVault(boolean tls) throws IllegalStateException {
-        String dataResource = getClass().getResource("/data_dir").getPath();
+    private VaultConfiguration initializeVault(boolean tls) throws IllegalStateException, IOException {
+        File dataDir = tmpDir.newFolder();
+        copyDirectory(new File(getClass().getResource("/data_dir").getPath()), dataDir);

        /* Generate vault local unencrypted configuration */
        VaultConfiguration config = new VaultConfiguration()
                .withHost("localhost")
                .withPort(getFreePort())
-                .withDataLocation(dataResource)
+                .withDataLocation(dataDir.toPath())
                .disableMlock();

        /* Enable TLS with custom certificate and key, if required */
--- a/src/test/java/de/stklcode/jvault/connector/exception/VaultConnectorExceptionTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/exception/VaultConnectorExceptionTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -16,12 +16,12 @@

 package de.stklcode.jvault.connector.exception;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;

 /**
 * Common JUnit test for Exceptions extending {@link VaultConnectorException}.
--- a/src/test/java/de/stklcode/jvault/connector/factory/HTTPVaultConnectorFactoryTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/factory/HTTPVaultConnectorFactoryTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,10 +19,10 @@ package de.stklcode.jvault.connector.factory;
 import de.stklcode.jvault.connector.HTTPVaultConnector;
 import de.stklcode.jvault.connector.exception.TlsException;
 import de.stklcode.jvault.connector.exception.VaultConnectorException;
-
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
 import org.junit.rules.TemporaryFolder;

 import java.io.IOException;
@ -30,7 +30,8 @@ import java.lang.reflect.Field;
 import java.nio.file.NoSuchFileException;

 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit test for HTTP Vault connector factory
@ -38,6 +39,7 @@ import static org.junit.Assert.*;
 * @author Stefan Kalscheuer
 * @since 0.6.0
 */
+@EnableRuleMigrationSupport
 public class HTTPVaultConnectorFactoryTest {
    private static String VAULT_ADDR = "https://localhost:8201";
    private static Integer VAULT_MAX_RETRIES = 13;
--- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,13 +18,14 @@ package de.stklcode.jvault.connector.model;

 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;

 /**
 * JUnit Test for AppRole Builder.
@ -53,7 +54,7 @@ public class AppRoleBuilderTest {
    private static final String JSON_FULL = String.format("{\"role_name\":\"%s\",\"role_id\":\"%s\",\"bind_secret_id\":%s,\"bound_cidr_list\":\"%s\",\"policies\":\"%s\",\"secret_id_num_uses\":%d,\"secret_id_ttl\":%d,\"token_ttl\":%d,\"token_max_ttl\":%d,\"period\":%d}",
            NAME, ID, BIND_SECRET_ID, CIDR_1, POLICY, SECRET_ID_NUM_USES, SECRET_ID_TTL, TOKEN_TTL, TOKEN_MAX_TTL, PERIOD);

-    @BeforeClass
+    @BeforeAll
    public static void init() {
        BOUND_CIDR_LIST.add(CIDR_1);
        POLICIES.add(POLICY);
--- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -16,11 +16,9 @@

 package de.stklcode.jvault.connector.model;

-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
 import java.lang.reflect.Field;
@ -29,12 +27,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import static org.hamcrest.Matchers.emptyString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.junit.MatcherAssume.assumeThat;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
+

 /**
 * JUnit Test for AppRoleSecret model.
--- a/src/test/java/de/stklcode/jvault/connector/model/AuthBackendTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/AuthBackendTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -16,10 +16,10 @@

 package de.stklcode.jvault.connector.model;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;

-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;

 /**
 * JUnit Test for AuthBackend model.
--- a/src/test/java/de/stklcode/jvault/connector/model/TokenBuilderTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/TokenBuilderTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,16 +18,16 @@ package de.stklcode.jvault.connector.model;

 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;

 /**
 * JUnit Test for Token Builder.
@ -55,7 +55,7 @@ public class TokenBuilderTest {
    private static final Boolean RENEWABLE = true;
    private static final String JSON_FULL = "{\"id\":\"test-id\",\"display_name\":\"display-name\",\"no_parent\":false,\"no_default_policy\":false,\"ttl\":123,\"num_uses\":4,\"policies\":[\"policy\"],\"meta\":{\"key\":\"value\"},\"renewable\":true}";

-    @BeforeClass
+    @BeforeAll
    public static void init() {
        POLICIES.add(POLICY);
        META.put(META_KEY, META_VALUE);
--- a/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java
@ -1,17 +1,33 @@
+/*
+ * Copyright 2016-2018 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.stklcode.jvault.connector.model.response;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
 import de.stklcode.jvault.connector.model.AppRole;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit Test for {@link AppRoleResponse} model.
--- a/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java
@ -1,20 +1,34 @@
+/*
+ * Copyright 2016-2018 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.stklcode.jvault.connector.model.response;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
 import de.stklcode.jvault.connector.model.AuthBackend;
-import de.stklcode.jvault.connector.model.response.embedded.AuthData;
 import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit Test for {@link AuthMethodsResponse} model.
--- a/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java
@ -1,17 +1,33 @@
+/*
+ * Copyright 2016-2018 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.stklcode.jvault.connector.model.response;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
 import de.stklcode.jvault.connector.model.response.embedded.AuthData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit Test for {@link AuthResponse} model.
--- a/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java
@ -1,14 +1,30 @@
+/*
+ * Copyright 2016-2018 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.stklcode.jvault.connector.model.response;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;

 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit Test for {@link AuthResponse} model.
--- a/src/test/java/de/stklcode/jvault/connector/model/response/SecretResponseTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/response/SecretResponseTest.java
@ -1,17 +1,33 @@
+/*
+ * Copyright 2016-2018 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.stklcode.jvault.connector.model.response;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit Test for {@link SecretResponse} model.
--- a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java
@ -1,17 +1,33 @@
+/*
+ * Copyright 2016-2018 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.stklcode.jvault.connector.model.response;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
 import de.stklcode.jvault.connector.model.response.embedded.TokenData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;

 /**
 * JUnit Test for {@link TokenResponse} model.
--- a/src/test/java/de/stklcode/jvault/connector/test/Credentials.java
+++ b/src/test/java/de/stklcode/jvault/connector/test/Credentials.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/test/java/de/stklcode/jvault/connector/test/VaultConfiguration.java
+++ b/src/test/java/de/stklcode/jvault/connector/test/VaultConfiguration.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Stefan Kalscheuer
+ * Copyright 2016-2018 Stefan Kalscheuer
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
Author	SHA1	Message	Date
Stefan Kalscheuer	aa2619b1b0	Bump version to 0.7.1	2018-03-17 14:01:55 +01:00
Stefan Kalscheuer	88d49bc9f7	Added automatic module name for JPMS compatibility	2018-03-15 19:54:18 +01:00
Stefan Kalscheuer	27e7a2dffc	Test against 0.9.5	2018-02-27 18:07:23 +01:00
Stefan Kalscheuer	41c15f285c	Test against 0.9.4	2018-02-24 10:58:45 +01:00
Stefan Kalscheuer	5f419e3f9b	Updated test dependencies * JUnit 5.1.0 * Mockito 2.15.0	2018-02-20 19:25:44 +01:00
Stefan Kalscheuer	9362e245ee	Minor test changes Changed Thread.sleep() to TimeUnit.SECONDS.sleep()	2018-02-20 19:25:07 +01:00
Stefan Kalscheuer	b2082925d5	Copy Vault data directory to temp location before each test To avoid the annoying clean before each test run (because Vault data has been modified by previous run), the data is now copied from resource directory to temporary location.	2018-02-04 20:04:47 +01:00
Stefan Kalscheuer	38a7d4952d	Minor dependency updates * httpcore 4.4.9 * httpclient 4.5.5 * jackon 2.9.4	2018-01-29 16:34:28 +01:00
Stefan Kalscheuer	23cea38da6	Test against 0.9.3	2018-01-29 16:30:51 +01:00
Stefan Kalscheuer	bf2da210ba	Test against 0.9.2	2018-01-28 10:35:19 +01:00
Stefan Kalscheuer	91fb012acc	Update copyright notice to 2018	2018-01-01 17:22:02 +01:00
Stefan Kalscheuer	61e1f3f745	Test against 0.9.1	2017-12-22 16:40:15 +01:00
Stefan Kalscheuer	50cd400ba3	Migrated tests to JUnit5 and removed PowerMock * Unit tests are using JUnit Jupiter framework * Enabled support for legacy rules for now * Replaced PowerMock with custom ByteBuddy redefinition for the offline test	2017-11-26 18:17:13 +01:00
Stefan Kalscheuer	470dcb48ba	Test framework migrated to Mockito/Powermock 2 This simple migration with the bare minimum of changes necessary solves compatibility issues with Java 9 build environments.	2017-11-25 18:43:25 +01:00
Stefan Kalscheuer	736f23c19a	Tested against 0.9.0	2017-11-16 20:34:52 +01:00