From 4751045e72d2356635cbdeda6ef74b53bd944b49 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Tue, 20 Jun 2023 01:24:33 +0200 Subject: [PATCH 1/4] Updated Gradle wrapper version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45003759..3301c79d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.6.1-all.zip From f633f0d4e6c1fe206b9f268e9a2475af07d5bdab Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Tue, 27 Jun 2023 00:29:42 +0200 Subject: [PATCH 2/4] Updated tests according to new location of images --- .../io/github/jopenlibs/vault/util/VaultAgentContainer.java | 2 +- .../java/io/github/jopenlibs/vault/util/VaultContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java index e42dea59..73b1414e 100644 --- a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java +++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java @@ -21,7 +21,7 @@ public class VaultAgentContainer extends GenericContainer implements TestConstants, TestLifecycleAware { - public static final String VAULT_DEFAULT_IMAGE = "vault"; + public static final String VAULT_DEFAULT_IMAGE = "hashicorp/vault"; public static final String VAULT_DEFAULT_TAG = "latest"; private static final Logger LOGGER = LoggerFactory.getLogger(VaultAgentContainer.class); diff --git a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java index de63fcec..bfec1f2c 100644 --- a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java +++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java @@ -29,7 +29,7 @@ public class VaultContainer extends GenericContainer implements TestConstants, TestLifecycleAware { - public static final String VAULT_DEFAULT_IMAGE = "vault"; + public static final String VAULT_DEFAULT_IMAGE = "hashicorp/vault"; public static final String VAULT_DEFAULT_TAG = "latest"; private static final Logger LOGGER = LoggerFactory.getLogger(VaultContainer.class); private String rootToken; From 8d2af28884e65071a7eb737a6f0b34e1e644b996 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Tue, 27 Jun 2023 00:30:03 +0200 Subject: [PATCH 3/4] Added in CI tests new releases of Vault --- .github/workflows/gradle.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d56610fc..8423b6aa 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,22 +17,22 @@ jobs: java: - 11 vault: - - 1.11.0 - - 1.11.1 - - 1.11.2 - - 1.11.3 - - 1.11.4 - - 1.11.5 - - 1.11.6 - - 1.11.7 - - 1.11.8 + - 1.11.12 - 1.12.0 - 1.12.1 - 1.12.2 - 1.12.3 - 1.12.4 + - 1.12.5 + - 1.12.6 + - 1.12.7 + - 1.12.8 - 1.13.0 - 1.13.1 + - 1.13.2 + - 1.13.3 + - 1.13.4 + - 1.14.0 - latest os: - ubuntu-latest From 5df42c009f973389d5c98ed45d1f99f850fcfc88 Mon Sep 17 00:00:00 2001 From: Enrico Bianchi Date: Tue, 27 Jun 2023 00:29:42 +0200 Subject: [PATCH 4/4] Updated tests according to new location of images --- .../io/github/jopenlibs/vault/util/VaultAgentContainer.java | 2 +- .../java/io/github/jopenlibs/vault/util/VaultContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java index e42dea59..73b1414e 100644 --- a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java +++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java @@ -21,7 +21,7 @@ public class VaultAgentContainer extends GenericContainer implements TestConstants, TestLifecycleAware { - public static final String VAULT_DEFAULT_IMAGE = "vault"; + public static final String VAULT_DEFAULT_IMAGE = "hashicorp/vault"; public static final String VAULT_DEFAULT_TAG = "latest"; private static final Logger LOGGER = LoggerFactory.getLogger(VaultAgentContainer.class); diff --git a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java index de63fcec..bfec1f2c 100644 --- a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java +++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java @@ -29,7 +29,7 @@ public class VaultContainer extends GenericContainer implements TestConstants, TestLifecycleAware { - public static final String VAULT_DEFAULT_IMAGE = "vault"; + public static final String VAULT_DEFAULT_IMAGE = "hashicorp/vault"; public static final String VAULT_DEFAULT_TAG = "latest"; private static final Logger LOGGER = LoggerFactory.getLogger(VaultContainer.class); private String rootToken;