Merge branch 'master' into feat/data-loader/metadata-service

scalar-labs · Jan 7, 2025 · a9f767d · a9f767d
2 parents a65c9b5 + a2a68f9
commit a9f767d
Show file tree

Hide file tree

Showing 50 changed files with 2,467 additions and 216 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,14 +33,14 @@ subprojects {
         postgresqlDriverVersion = '42.7.4'
         oracleDriverVersion = '21.16.0.0'
         sqlserverDriverVersion = '11.2.3.jre8'
-        sqliteDriverVersion = '3.47.1.0'
+        sqliteDriverVersion = '3.47.2.0'
         yugabyteDriverVersion = '42.7.3-yb-2'
         mariadDbDriverVersion = '3.5.1'
         picocliVersion = '4.7.6'
         commonsTextVersion = '1.13.0'
         junitVersion = '5.11.4'
         commonsLangVersion = '3.17.0'
-        assertjVersion = '3.26.3'
+        assertjVersion = '3.27.2'
         mockitoVersion = '4.11.0'
         spotbugsVersion = '4.8.6'
         errorproneVersion = '2.10.0'

diff --git a/core/build.gradle b/core/build.gradle
@@ -107,7 +107,9 @@ dependencies {
     implementation "com.microsoft.sqlserver:mssql-jdbc:${sqlserverDriverVersion}"
     implementation "org.xerial:sqlite-jdbc:${sqliteDriverVersion}"
     implementation "com.yugabyte:jdbc-yugabytedb:${yugabyteDriverVersion}"
-    implementation "org.mariadb.jdbc:mariadb-java-client:${mariadDbDriverVersion}"
+    implementation ("org.mariadb.jdbc:mariadb-java-client:${mariadDbDriverVersion}") {
+        exclude group: 'org.slf4j', module: 'slf4j-api'
+    }
     implementation "org.apache.commons:commons-text:${commonsTextVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"

diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTestUtils.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTestUtils.java
@@ -118,10 +118,6 @@ public JdbcAdminImportTestUtils(Properties properties) {
     majorVersion = getMajorVersion();
   }
 
-  // For the SpotBugs warning CT_CONSTRUCTOR_THROW
-  @Override
-  protected final void finalize() {}
-
   public Map<String, TableMetadata> createExistingDatabaseWithAllDataTypes(String namespace)
       throws SQLException {
     execute(rdbEngine.createSchemaSqls(namespace));