From cbec463d3b83f0455eb54009009b101498c2a8eb Mon Sep 17 00:00:00 2001 From: Guian Gumpac Date: Tue, 18 Oct 2022 21:11:43 -0700 Subject: [PATCH 1/2] Bumped the JDBC driver version to 2.0.0.0 Signed-off-by: Guian Gumpac --- sql-jdbc/build.gradle | 2 +- sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java | 2 +- .../src/main/java/org/opensearch/jdbc/internal/Version.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 2031d417b3..cf5c9ef4f8 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -24,7 +24,7 @@ plugins { group 'org.opensearch.client' // keep version in sync with version in Driver source -version '1.1.0.1' +version '2.0.0.0' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false")); if (snapshot) { diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java index e6a85879b8..337365e177 100644 --- a/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java +++ b/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java @@ -507,7 +507,7 @@ public Logger getLog() { } private String getUserAgent() { - return String.format("openes-jdbc/%s (Java %s)", + return String.format("opensearch-jdbc/%s (Java %s)", Version.Current.getFullVersion(), JavaUtil.getJavaVersion()); } } diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java index 977e743dda..e54641c891 100644 --- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java +++ b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java @@ -9,7 +9,7 @@ public enum Version { // keep this in sync with the gradle version - Current(1, 0, 0, 0); + Current(2, 0, 0, 0); private int major; private int minor; From f8fdefe9301f64b2eb3a1105b6057f8967c33f7f Mon Sep 17 00:00:00 2001 From: Guian Gumpac Date: Wed, 19 Oct 2022 15:53:08 -0700 Subject: [PATCH 2/2] Added a test to ensure versions match in the jar file and debug messages Signed-off-by: Guian Gumpac --- sql-jdbc/build.gradle | 1 + .../org/opensearch/jdbc/internal/Version.java | 2 +- .../jdbc/internal/VersionMatchTest.java | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index cf5c9ef4f8..14b67670fa 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -98,6 +98,7 @@ shadowJar { } test { + systemProperty("opensearch_jdbc_version", version); useJUnitPlatform() } diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java index e54641c891..006f0b6962 100644 --- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java +++ b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java @@ -8,7 +8,7 @@ public enum Version { - // keep this in sync with the gradle version + // keep this in sync with the sql-jdbc/build.gradle file Current(2, 0, 0, 0); private int major; diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java new file mode 100644 index 0000000000..6c3c3f920b --- /dev/null +++ b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java @@ -0,0 +1,16 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + +import org.junit.jupiter.api.Test; +import org.opensearch.jdbc.internal.Version; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class VersionMatchTest { + + @Test + void testVersionMatchesBuildGradleVersion() { + assertEquals(Version.Current.getFullVersion(), System.getProperty("opensearch_jdbc_version")); + } +}