From fbd44bd3496f9c8412fa549304c3be1d96d13a07 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 23 Jun 2022 14:57:41 +0200 Subject: [PATCH] Upgrade DB2 Docker image to 11.5.7.0a. Closes #1272 --- ci/accept-third-party-license.sh | 4 ++-- .../data/jdbc/testing/Db2DataSourceConfiguration.java | 3 ++- .../springframework/data/jdbc/testing/LicenseListener.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/accept-third-party-license.sh b/ci/accept-third-party-license.sh index efc815ac4..2b3bc933e 100755 --- a/ci/accept-third-party-license.sh +++ b/ci/accept-third-party-license.sh @@ -2,5 +2,5 @@ { echo "mcr.microsoft.com/mssql/server:2017-CU12" - echo "ibmcom/db2:11.5.0.0a" -} > spring-data-jdbc/src/test/resources/container-license-acceptance.txt \ No newline at end of file + echo "ibmcom/db2:11.5.7.0a" +} > spring-data-jdbc/src/test/resources/container-license-acceptance.txt diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java index 2e97dd479..6fac83625 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java @@ -37,6 +37,7 @@ import org.testcontainers.containers.Db2Container; @Profile("db2") class Db2DataSourceConfiguration extends DataSourceConfiguration { + public static final String DOCKER_IMAGE_NAME = "ibmcom/db2:11.5.7.0a"; private static final Log LOG = LogFactory.getLog(Db2DataSourceConfiguration.class); private static Db2Container DB_2_CONTAINER; @@ -47,7 +48,7 @@ class Db2DataSourceConfiguration extends DataSourceConfiguration { if (DB_2_CONTAINER == null) { LOG.info("DB2 starting..."); - Db2Container container = new Db2Container().withReuse(true); + Db2Container container = new Db2Container(DOCKER_IMAGE_NAME).withReuse(true); container.start(); LOG.info("DB2 started"); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java index 1db53ac4b..bb01f4697 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java @@ -43,7 +43,7 @@ public class LicenseListener implements TestExecutionListener { environment = new StandardEnvironment(); if (environment.acceptsProfiles(Profiles.of("db2"))) { - assumeLicenseAccepted(Db2Container.DEFAULT_DB2_IMAGE_NAME + ":" + Db2Container.DEFAULT_TAG); + assumeLicenseAccepted(Db2DataSourceConfiguration.DOCKER_IMAGE_NAME); } if (environment.acceptsProfiles(Profiles.of("mssql"))) {