From b58ef7aee695781f35f47a6533ca5f20d7c4f321 Mon Sep 17 00:00:00 2001 From: Mark Rotteveel Date: Fri, 6 Jan 2023 15:41:35 +0100 Subject: [PATCH] Upgrade default image version to 4.0.2 --- CHANGES.md | 2 ++ .../org/firebirdsql/testcontainers/FirebirdContainer.java | 2 +- .../org/firebirdsql/testcontainers/FirebirdTestImages.java | 4 ++-- .../java/org/firebirdsql/testcontainers/JDBCDriverTest.java | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e0f074a..b67882d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,8 @@ Version History ----- - Updated org.testcontainers:jdbc to 1.17.6 - Updated various test-dependencies +- Updated default image version to Firebird 4.0.2. \ + Make sure you specify versions explicitly if you need to stay on Firebird 3.0. 1.2.0 ----- diff --git a/src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java b/src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java index f968faf..4823885 100644 --- a/src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java +++ b/src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java @@ -17,7 +17,7 @@ public class FirebirdContainer> extends Jdb public static final String ALTERNATE_NAME = "firebirdsql"; public static final String IMAGE = "jacobalberty/firebird"; static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(IMAGE); - public static final String DEFAULT_TAG = "v3.0.8"; + public static final String DEFAULT_TAG = "v4.0.2"; public static final Integer FIREBIRD_PORT = 3050; private static final String FIREBIRD_SYSDBA = "sysdba"; diff --git a/src/test/java/org/firebirdsql/testcontainers/FirebirdTestImages.java b/src/test/java/org/firebirdsql/testcontainers/FirebirdTestImages.java index 21606a9..ebd245d 100644 --- a/src/test/java/org/firebirdsql/testcontainers/FirebirdTestImages.java +++ b/src/test/java/org/firebirdsql/testcontainers/FirebirdTestImages.java @@ -4,10 +4,10 @@ public final class FirebirdTestImages { - public static final DockerImageName FIREBIRD_308_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("v3.0.8"); + public static final DockerImageName FIREBIRD_402_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("v4.0.2"); public static final DockerImageName FIREBIRD_259_SC_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("2.5.9-sc"); public static final DockerImageName FIREBIRD_259_SS_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("2.5.9-ss"); - public static final DockerImageName FIREBIRD_TEST_IMAGE = FIREBIRD_308_IMAGE; + public static final DockerImageName FIREBIRD_TEST_IMAGE = FIREBIRD_402_IMAGE; private FirebirdTestImages() { throw new AssertionError("no instances"); diff --git a/src/test/java/org/firebirdsql/testcontainers/JDBCDriverTest.java b/src/test/java/org/firebirdsql/testcontainers/JDBCDriverTest.java index 1c92c62..ce2e26c 100644 --- a/src/test/java/org/firebirdsql/testcontainers/JDBCDriverTest.java +++ b/src/test/java/org/firebirdsql/testcontainers/JDBCDriverTest.java @@ -40,9 +40,9 @@ public static Iterable data() { new Object[][]{ {"jdbc:tc:firebird://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, {"jdbc:tc:firebird:v4.0.0://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, - {"jdbc:tc:firebird:v3.0.8://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, + {"jdbc:tc:firebird:v3.0.10://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, {"jdbc:tc:firebird:3.0.7://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, - {"jdbc:tc:firebirdsql:v3.0.8://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, + {"jdbc:tc:firebirdsql:v3.0.10://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, {"jdbc:tc:firebirdsql:2.5.9-sc://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, {"jdbc:tc:firebirdsql:2.5.9-ss://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)}, });