diff --git a/.travis.yml b/.travis.yml index 60958c2..d5f500c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ addons: env: - PATH=$PATH:. before_script: - - wget https://releases.hashicorp.com/vault/0.10.0/vault_0.10.0_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.10.0/vault_0.10.0_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.10.0_linux_amd64.zip - - rm vault_0.10.0_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/0.11.2/vault_0.11.2_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/0.11.2/vault_0.11.2_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_0.11.2_linux_amd64.zip + - rm vault_0.11.2_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/CHANGELOG.md b/CHANGELOG.md index fb0b758..ee4a0ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * **[breaking]** Removed support for `HTTPVaultConnectorFactory#withSslContext()` in favor of `#withTrustedCA()` due to refactoring of the internal SSL handling (#17) * [improvement] `VaultConnector` extends `java.io.Serializable` (#19) +* [improvement] Build environment and tests now compatible with Java 10 +* [dependencies] Updated dependencies to fix vulnerabilities (i.e. CVE-2018-7489) * [deprecation] `VaultConnectorFactory` is deprecated in favor of `VaultConnectorBuilder` with identical API (#18) ## 0.7.1 [2018-03-17] diff --git a/README.md b/README.md index 5972ddf..5633707 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Java Vault Connector [![Build Status](https://travis-ci.org/stklcode/jvaultconnector.svg?branch=master)](https://travis-ci.org/stklcode/jvaultconnector) -[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=de.stklcode.jvault%3Aconnector)](https://sonarcloud.io/dashboard?id=de.stklcode.jvault%3Aconnector) +[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=de.stklcode.jvault%3Aconnector&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.stklcode.jvault%3Aconnector) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/stklcode/jvaultconnector/blob/master/LICENSE.txt) [![Maven Central](https://img.shields.io/maven-central/v/de.stklcode.jvault/connector.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.stklcode.jvault%22%20AND%20a%3A%22connector%22) @@ -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.10.0 +* Tested against Vault 0.11.2 ## Maven Artifact diff --git a/pom.xml b/pom.xml index 035e47c..678e991 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.0 1.8 1.8 @@ -61,17 +61,17 @@ org.apache.maven.plugins maven-clean-plugin - 3.0.0 + 3.1.0 org.apache.maven.plugins maven-resources-plugin - 3.0.2 + 3.1.0 org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.1.0 @@ -88,14 +88,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 - - - org.junit.platform - junit-platform-surefire-provider - 1.1.0 - - + 2.22.0 @@ -105,34 +98,34 @@ org.apache.httpcomponents httpcore - 4.4.9 + 4.4.10 org.apache.httpcomponents httpclient - 4.5.5 + 4.5.6 com.fasterxml.jackson.core jackson-core - 2.9.4 + 2.9.6 com.fasterxml.jackson.core jackson-databind - 2.9.4 + 2.9.6 org.junit.jupiter junit-jupiter-engine - 5.1.0 + 5.3.0 test org.junit.jupiter junit-jupiter-migrationsupport - 5.1.0 + 5.3.0 org.hamcrest @@ -143,19 +136,19 @@ com.github.stefanbirkner system-rules - 1.17.1 + 1.17.2 test org.mockito mockito-core - 2.17.0 + 2.21.0 test org.mockito mockito-inline - 2.17.0 + 2.21.0 test diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 0348fd6..44403a2 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.10.0"; // the vault version this test is supposed to run against + private static final String VAULT_VERISON = "0.11.2"; // 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";