From 45273e7d1216bf02f5a6c1ce7a8dffde503465f5 Mon Sep 17 00:00:00 2001 From: Srinivasa Vasu Date: Sun, 14 Nov 2021 08:35:20 +0530 Subject: [PATCH] update: ysql latest driver and the default image tag Signed-off-by: Srinivasa Vasu --- modules/yugabytedb/build.gradle | 5 +++-- .../containers/YugabyteContainerConstants.java | 6 +++--- .../org/testcontainers/YugabyteTestContainerConstants.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle index 7992e09b95a..c68b9337424 100644 --- a/modules/yugabytedb/build.gradle +++ b/modules/yugabytedb/build.gradle @@ -1,10 +1,11 @@ description = "Testcontainers :: JDBC :: YugabyteDB" dependencies { - api project(':jdbc') + // api project(':jdbc') + api 'org.testcontainers:jdbc:1.16.0' testImplementation project(':jdbc-test') // YCQL driver implementation 'com.yugabyte:java-driver-core:4.6.0-yb-6' // YSQL driver - testImplementation 'com.yugabyte:jdbc-yugabytedb:42.2.7-yb-5-beta.2' + testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.0' } diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteContainerConstants.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteContainerConstants.java index 53a716fa963..398dc309f3b 100644 --- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteContainerConstants.java +++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteContainerConstants.java @@ -11,7 +11,7 @@ public interface YugabyteContainerConstants { DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yugabytedb/yugabyte"); - String DEFAULT_TAG = "2.7.2.0-b216"; + String DEFAULT_TAG = "2.9.1.0-b140"; String NAME = "yugabyte"; @@ -23,9 +23,9 @@ public interface YugabyteContainerConstants { Integer TSERVER_DASHBOARD_PORT = 9000; - String JDBC_DRIVER_CLASS = "org.postgresql.Driver"; + String JDBC_DRIVER_CLASS = "com.yugabyte.Driver"; - String JDBC_CONNECT_PREFIX = "jdbc:postgresql"; + String JDBC_CONNECT_PREFIX = "jdbc:yugabytedb"; String ENTRYPOINT = "bin/yugabyted start --daemon=false"; diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/YugabyteTestContainerConstants.java b/modules/yugabytedb/src/test/java/org/testcontainers/YugabyteTestContainerConstants.java index d94b01a422b..f71dd83ea14 100644 --- a/modules/yugabytedb/src/test/java/org/testcontainers/YugabyteTestContainerConstants.java +++ b/modules/yugabytedb/src/test/java/org/testcontainers/YugabyteTestContainerConstants.java @@ -7,7 +7,7 @@ */ public interface YugabyteTestContainerConstants { - String IMAGE_NAME = "yugabytedb/yugabyte:2.7.2.0-b216"; + String IMAGE_NAME = "yugabytedb/yugabyte:2.9.1.0-b140"; DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);