From 4622cf6820a3bbf788de736099f5807a781305a6 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Thu, 25 Aug 2022 09:46:01 +1000 Subject: [PATCH] update Tessera version and ubuntu for xl-machine-executor (#4305) * latest ubuntu for xl-machine-ex * tessera docker image version Signed-off-by: Sally MacFarlane --- .circleci/config.yml | 2 +- build.gradle | 2 +- .../org/hyperledger/besu/tests/container/ContainerTestBase.java | 2 +- .../org/hyperledger/enclave/testutil/TesseraTestHarness.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 106d7667324..5b5923e2200 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ executors: xl_machine_executor: machine: - image: ubuntu-2004:202101-01 + image: ubuntu-2004:202201-02 #Ubuntu 20.04, Docker v20.10.12, Docker Compose v1.29.2, Google Cloud SDK updates resource_class: xlarge trivy_executor: diff --git a/build.gradle b/build.gradle index a4e5651b89f..78b62d86885 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ import net.ltgt.gradle.errorprone.CheckSeverity import java.text.SimpleDateFormat plugins { - id 'com.diffplug.spotless' version '6.8.0' + id 'com.diffplug.spotless' version '6.10.0' id 'com.github.ben-manes.versions' version '0.42.0' id 'com.github.hierynomus.license' version '0.16.1-fix' id 'com.jfrog.artifactory' version '4.28.3' diff --git a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java index b116a24d139..5e5e17e6a22 100644 --- a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java +++ b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java @@ -49,7 +49,7 @@ public class ContainerTestBase { private final String besuImage = System.getProperty("containertest.imagename"); public static final String GOQUORUM_VERSION = "22.4.4"; - public static final String TESSERA_VERSION = "22.1.5"; + public static final String TESSERA_VERSION = "22.1.6"; protected final String goQuorumTesseraPubKey = "3XGBIf+x8IdVQOVfIsbRnHwTYOJP/Fx84G8gMmy8qDM="; protected final String besuTesseraPubKey = "8JJLEAbq6o9m4Kqm++v0Y1n9Z2ryAFtZTyhnxSKWgws="; diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java index f70c97cad91..79795e9965e 100644 --- a/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java +++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java @@ -49,7 +49,7 @@ public class TesseraTestHarness implements EnclaveTestHarness { private URI q2TUri; private URI thirdPartyUri; - public static final String TESSERA_VERSION = "22.1.5"; + public static final String TESSERA_VERSION = "22.1.6"; private final int thirdPartyPort = 9081; private final int q2TPort = 9082;