diff --git a/.github/workflows/coverageReport.yml b/.github/workflows/coverageReport.yml index dde3af2d8..2cb9a8800 100644 --- a/.github/workflows/coverageReport.yml +++ b/.github/workflows/coverageReport.yml @@ -34,7 +34,7 @@ jobs: ${{ runner.os }}-m2- - name: Run tests with coverage - run: mvn -pl jdbc-core clean test -Dgroups='!Jvm17PlusAndArrowToNioReflectionDisabled' jacoco:report + run: mvn -pl jdbc-core clean test -Dgroups='!Jvm17PlusAndArrowToNioReflectionDisabled' jacoco:report -Ddependency-check.skip=true - name: Check for coverage override id: override diff --git a/README.md b/README.md index cfefcc7d1..0d72d043b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Add the following dependency to your `pom.xml`: com.databricks databricks-jdbc - 3.3.1 + 3.3.2-SNAPSHOT ``` diff --git a/assembly-thin/pom.xml b/assembly-thin/pom.xml index 3b083dd4b..5c084cce6 100644 --- a/assembly-thin/pom.xml +++ b/assembly-thin/pom.xml @@ -7,7 +7,7 @@ com.databricks databricks-jdbc-parent - 3.3.1 + 3.3.2-SNAPSHOT databricks-jdbc-thin @@ -51,7 +51,7 @@ com.databricks databricks-jdbc-core - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/assembly-uber/pom.xml b/assembly-uber/pom.xml index 0021c225b..ce9c30486 100644 --- a/assembly-uber/pom.xml +++ b/assembly-uber/pom.xml @@ -7,7 +7,7 @@ com.databricks databricks-jdbc-parent - 3.3.1 + 3.3.2-SNAPSHOT databricks-jdbc @@ -51,7 +51,7 @@ com.databricks databricks-jdbc-core - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/jdbc-core/pom.xml b/jdbc-core/pom.xml index e362514c0..8a41d681a 100644 --- a/jdbc-core/pom.xml +++ b/jdbc-core/pom.xml @@ -6,7 +6,7 @@ com.databricks databricks-jdbc-parent - 3.3.1 + 3.3.2-SNAPSHOT databricks-jdbc-core diff --git a/pom.xml b/pom.xml index 9771f153d..148e2077d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.databricks databricks-jdbc-parent - 3.3.1 + 3.3.2-SNAPSHOT pom Databricks JDBC Parent Parent POM for Databricks JDBC Driver. @@ -63,7 +63,7 @@ 3.6.1 - 3.3.1 + 3.3.2-SNAPSHOT 18.3.0 3.18.0 2.10.1 diff --git a/src/main/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaData.java b/src/main/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaData.java index 54b6e3a2f..2e695274c 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaData.java +++ b/src/main/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaData.java @@ -28,7 +28,7 @@ public class DatabricksDatabaseMetaData implements DatabaseMetaData { public static final String PRODUCT_NAME = "SparkSQL"; public static final int DATABASE_MAJOR_VERSION = 3; public static final int DATABASE_MINOR_VERSION = 3; - public static final int DATABASE_PATCH_VERSION = 1; + public static final int DATABASE_PATCH_VERSION = 2; public static final Integer MAX_NAME_LENGTH = 128; public static final String NUMERIC_FUNCTIONS = "ABS,ACOS,ASIN,ATAN,ATAN2,CEILING,COS,COT,DEGREES,EXP,FLOOR,LOG,LOG10,MOD,PI,POWER,RADIANS,RAND,ROUND,SIGN,SIN,SQRT,TAN,TRUNCATE"; diff --git a/src/main/java/com/databricks/jdbc/common/util/DriverUtil.java b/src/main/java/com/databricks/jdbc/common/util/DriverUtil.java index 55e274e8b..1a479888e 100644 --- a/src/main/java/com/databricks/jdbc/common/util/DriverUtil.java +++ b/src/main/java/com/databricks/jdbc/common/util/DriverUtil.java @@ -20,7 +20,7 @@ public class DriverUtil { private static final JdbcLogger LOGGER = JdbcLoggerFactory.getLogger(DriverUtil.class); - private static final String DRIVER_VERSION = "3.3.1"; + private static final String DRIVER_VERSION = "3.3.2-SNAPSHOT"; private static final String DRIVER_NAME = "oss-jdbc"; private static final String JDBC_VERSION = "4.3"; diff --git a/src/test/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaDataTest.java b/src/test/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaDataTest.java index eb87a4b4c..669626b15 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaDataTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/DatabricksDatabaseMetaDataTest.java @@ -828,7 +828,7 @@ public void testNullsAreSortedAtEnd() throws SQLException { @Test public void testGetDatabaseProductVersion() throws SQLException { String result = metaData.getDatabaseProductVersion(); - assertEquals("3.3.1", result); + assertEquals("3.3.2", result); } @Test @@ -840,7 +840,7 @@ public void testGetDriverName() throws SQLException { @Test public void testGetDriverVersion() throws SQLException { String result = metaData.getDriverVersion(); - assertEquals("3.3.1", result); + assertEquals("3.3.2-SNAPSHOT", result); } @Test diff --git a/src/test/java/com/databricks/jdbc/common/safe/DatabricksDriverFeatureFlagsContextTest.java b/src/test/java/com/databricks/jdbc/common/safe/DatabricksDriverFeatureFlagsContextTest.java index 0e28605b7..395adb740 100644 --- a/src/test/java/com/databricks/jdbc/common/safe/DatabricksDriverFeatureFlagsContextTest.java +++ b/src/test/java/com/databricks/jdbc/common/safe/DatabricksDriverFeatureFlagsContextTest.java @@ -37,7 +37,7 @@ class DatabricksDriverFeatureFlagsContextTest { @Mock private ObjectMapper objectMapperMock; private static final String FEATURE_FLAG_NAME = "featureFlagName"; private static final String FEATURE_FLAGS_ENDPOINT = - "https://test-host/api/2.0/connector-service/feature-flags/OSS_JDBC/3.3.1"; + "https://test-host/api/2.0/connector-service/feature-flags/OSS_JDBC/3.3.2-SNAPSHOT"; private DatabricksDriverFeatureFlagsContext context; diff --git a/src/test/java/com/databricks/jdbc/common/util/DriverUtilTest.java b/src/test/java/com/databricks/jdbc/common/util/DriverUtilTest.java index 1a26b8641..2d08c3448 100644 --- a/src/test/java/com/databricks/jdbc/common/util/DriverUtilTest.java +++ b/src/test/java/com/databricks/jdbc/common/util/DriverUtilTest.java @@ -14,14 +14,14 @@ public class DriverUtilTest { public void testGetDriverVersion() { String version = DriverUtil.getDriverVersion(); assertNotNull(version); - assertEquals("3.3.1", version); + assertEquals("3.3.2-SNAPSHOT", version); } @Test public void testGetDriverVersionWithoutOSSSuffix() { String version = DriverUtil.getDriverVersionWithoutOSSSuffix(); assertNotNull(version); - assertEquals("3.3.1", version); + assertEquals("3.3.2-SNAPSHOT", version); } @Test diff --git a/test-assembly-thin/pom.xml b/test-assembly-thin/pom.xml index b597785b4..27d322ea4 100644 --- a/test-assembly-thin/pom.xml +++ b/test-assembly-thin/pom.xml @@ -7,7 +7,7 @@ com.databricks databricks-jdbc-parent - 3.3.1 + 3.3.2-SNAPSHOT test-databricks-jdbc-thin @@ -24,7 +24,7 @@ com.databricks databricks-jdbc-thin - 3.3.1 + 3.3.2-SNAPSHOT org.junit.jupiter diff --git a/test-assembly-uber/pom.xml b/test-assembly-uber/pom.xml index 9cdcb3a37..8b2754f4d 100644 --- a/test-assembly-uber/pom.xml +++ b/test-assembly-uber/pom.xml @@ -7,7 +7,7 @@ com.databricks databricks-jdbc-parent - 3.3.1 + 3.3.2-SNAPSHOT test-databricks-jdbc-uber @@ -24,7 +24,7 @@ com.databricks databricks-jdbc - 3.3.1 + 3.3.2-SNAPSHOT org.junit.jupiter