From 835e95c222a35d5a5f0fde9530852e36b908e5b0 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Sun, 12 May 2024 18:37:43 +0100 Subject: [PATCH 1/3] ES-2371: Consume H2 DB snapshot version --- build.gradle | 14 ++++++++++++++ constants.properties | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c63f8e5370..51f3e45137 100644 --- a/build.gradle +++ b/build.gradle @@ -438,6 +438,20 @@ allprojects { includeGroup 'com.github.detro' } } + // required until h2database 2.2.229 is released + maven { + url "${artifactory_contextUrl}/corda-dependencies-dev" + authentication { + basic(BasicAuthentication) + } + credentials { + username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') + password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') + } + content { + includeGroupByRegex 'com\\.h2database(\\..*)?' + } + } maven { url "${publicArtifactURL}/corda-dev" content { diff --git a/constants.properties b/constants.properties index 7db38579d3..fcdb5deb26 100644 --- a/constants.properties +++ b/constants.properties @@ -78,7 +78,7 @@ joptSimpleVersion=5.0.2 jansiVersion=1.18 hibernateVersion=5.6.14.Final # h2Version - Update docs if renamed or removed. -h2Version=2.2.224 +h2Version=2.2.229-SNAPSHOT rxjavaVersion=1.3.8 dokkaVersion=0.10.1 eddsaVersion=0.3.0 From 204a86d9a60339a3f0e9f079b61ab75fc0b5d648 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 May 2024 14:17:44 +0100 Subject: [PATCH 2/3] ES-2371: Update version --- constants.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.properties b/constants.properties index fcdb5deb26..b9697c4058 100644 --- a/constants.properties +++ b/constants.properties @@ -78,7 +78,7 @@ joptSimpleVersion=5.0.2 jansiVersion=1.18 hibernateVersion=5.6.14.Final # h2Version - Update docs if renamed or removed. -h2Version=2.2.229-SNAPSHOT +h2Version=2.2.224-R3 rxjavaVersion=1.3.8 dokkaVersion=0.10.1 eddsaVersion=0.3.0 From 4efda6d46b04af00bdc5701b47a3de8dbda60759 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 May 2024 15:30:01 +0100 Subject: [PATCH 3/3] ES-2371: use public mirror --- build.gradle | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 51f3e45137..531d154f6a 100644 --- a/build.gradle +++ b/build.gradle @@ -438,16 +438,9 @@ allprojects { includeGroup 'com.github.detro' } } - // required until h2database 2.2.229 is released + // required until next version of h2database is released post 2.2.224 maven { - url "${artifactory_contextUrl}/corda-dependencies-dev" - authentication { - basic(BasicAuthentication) - } - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } + url "${publicArtifactURL}/corda-dependencies-dev" content { includeGroupByRegex 'com\\.h2database(\\..*)?' }