diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDefaultValueConverter.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDefaultValueConverter.java index 4f3924e3d..670b24b33 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDefaultValueConverter.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDefaultValueConverter.java @@ -26,6 +26,7 @@ import io.debezium.relational.Column; import io.debezium.relational.ValueConverter; import io.debezium.util.HexConverter; + import microsoft.sql.DateTimeOffset; /** diff --git a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ApicurioRegistryContainer.java b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ApicurioRegistryContainer.java index 18db267b5..6b16c9bf0 100644 --- a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ApicurioRegistryContainer.java +++ b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ApicurioRegistryContainer.java @@ -24,8 +24,8 @@ public ApicurioRegistryContainer() { } public static String getApicurioVersion() { - String APICURIO_VERSION_TEST_PROPERTY = System.getProperty(TEST_PROPERTY_PREFIX + "apicurio.version"); - return APICURIO_VERSION_TEST_PROPERTY != null ? APICURIO_VERSION_TEST_PROPERTY + String apicurioVersionTestProperty = System.getProperty(TEST_PROPERTY_PREFIX + "apicurio.version"); + return apicurioVersionTestProperty != null ? apicurioVersionTestProperty : ContainerImageVersions.getStableVersion("apicurio/apicurio-registry-mem"); } } diff --git a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ContainerImageVersions.java b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ContainerImageVersions.java index 45fb67bba..0e1a0d8c1 100644 --- a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ContainerImageVersions.java +++ b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/ContainerImageVersions.java @@ -41,14 +41,14 @@ public static String getStableVersion(String image) { Pattern pattern = Pattern.compile("\\d.\\d.\\d.Final"); Matcher matcher = pattern.matcher(response); - List STABLE_VERSION_LIST = new ArrayList<>(); + List stableVersionList = new ArrayList<>(); while (matcher.find()) { - STABLE_VERSION_LIST.add(matcher.group()); + stableVersionList.add(matcher.group()); } - Collections.sort(STABLE_VERSION_LIST); - return STABLE_VERSION_LIST.get(STABLE_VERSION_LIST.size() - 1); + Collections.sort(stableVersionList); + return stableVersionList.get(stableVersionList.size() - 1); } else { throw new RuntimeException("Couldn't obtain stable version for image " + image);