Backport to branch(3) : Bump the dependencies group with 6 updates (#182)

* Bump the dependencies group with 6 updates

---
updated-dependencies:
- dependency-name: io.dropwizard.metrics:metrics-core
  dependency-version: 4.2.33
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: io.dropwizard.metrics:metrics-jmx
  dependency-version: 4.2.33
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: io.dropwizard.metrics:metrics-jmx
  dependency-version: 4.2.33
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: com.scalar-labs:scalardb
  dependency-version: 3.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: com.scalar-labs:scalardb-schema-loader
  dependency-version: 3.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-version: 2.25.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-version: 2.25.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-version: 2.25.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: com.scalar-labs:scalardb-schema-loader
  dependency-version: 3.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...



* Fix errors for log4j and ScalarDB

* Fix for the recovery behavior change in ScalarDB

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jun Nemoto <[email protected]>

Author: 3 people

build.gradle

@@ -19,14 +19,14 @@ subprojects {
         guiceVersion = '5.1.0'
         guavaVersion = '32.1.3-jre'
         slf4jVersion = '1.7.36'
-        log4jVersion = '2.24.3'
+        log4jVersion = '2.25.0'
         jsonpVersion = '1.1.4'
         jacksonVersion = '2.19.1'
         toml4jVersion = '0.7.2'
-        scalarDbVersion = '3.15.3'
+        scalarDbVersion = '3.16.0'
         scalarAdminVersion = '2.2.1'
         resilience4jRetryVersion = '1.7.1'
-        dropwizardMetricsVersion = '4.2.32'
+        dropwizardMetricsVersion = '4.2.33'
         prometheusVersion = '0.16.0'
         jettyVersion = '9.4.57.v20241219'
         assertjVersion = '3.27.3'
@@ -54,6 +54,12 @@ subprojects {
 
     dependencies {
         implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
+        implementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}") {
+            exclude group: 'com.github.spotbugs', module: 'spotbugs-annotations'
+        }
+        implementation(group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}") {
+            exclude group: 'com.github.spotbugs', module: 'spotbugs-annotations'
+        }
         implementation group: 'com.google.inject', name: 'guice', version: "${guiceVersion}"
         implementation group: 'com.google.guava', name: 'guava', version: "${guavaVersion}"
         implementation group: 'javax.json', name: 'javax.json-api', version: "${jsonpVersion}"

client/build.gradle

@@ -28,8 +28,6 @@ dependencies {
     api project(':common')
     implementation group: 'com.moandjiezana.toml', name: 'toml4j', version: "${toml4jVersion}"
     implementation group: 'info.picocli', name: 'picocli', version: "${picoCliVersion}"
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}"
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
     api group: 'com.scalar-labs', name: 'scalardb', version: "${scalarDbVersion}"
     api group: 'javax.json', name: 'javax.json-api', version: "${jsonpVersion}"
     api group: 'org.glassfish', name: 'javax.json', version: "${jsonpVersion}"

generic-contracts/src/integration-test/java/com/scalar/dl/genericcontracts/GenericContractObjectAndCollectionEndToEndTest.java

@@ -59,7 +59,7 @@
 import com.scalar.db.api.Scan.Ordering;
 import com.scalar.db.api.Scanner;
 import com.scalar.db.api.TransactionState;
-import com.scalar.db.common.error.CoreError;
+import com.scalar.db.common.CoreError;
 import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.io.Key;
 import com.scalar.dl.client.exception.ClientException;
@@ -82,6 +82,10 @@
 
 public class GenericContractObjectAndCollectionEndToEndTest
     extends GenericContractEndToEndTestBase {
+  private static final String COORDINATOR_NAMESPACE = "coordinator";
+  private static final String COORDINATOR_STATE_TABLE = "state";
+  private static final String METADATA_TX_STATE = "tx_state";
+
   private static final String ASSET_ID = "id";
   private static final String ASSET_AGE = "age";
   private static final String ASSET_OUTPUT = "output";
@@ -637,11 +641,13 @@ public void putObject_FunctionArgumentsGiven_ShouldPutRecordToFunctionTable()
             .table(getFunctionTable())
             .partitionKey(Key.ofText(SOME_COLUMN_NAME_1, SOME_OBJECT_ID))
             .clusteringKey(Key.ofText(SOME_COLUMN_NAME_2, SOME_VERSION_ID_0))
-            .intValue("tx_state", TransactionState.ABORTED.get())
+            .intValue(METADATA_TX_STATE, TransactionState.PREPARED.get())
             .build();
     clientService.executeContract(
         ID_OBJECT_PUT, contractArguments0, ID_OBJECT_PUT_MUTABLE, functionArguments0);
+    // Make the transaction prepared state and non-expired
     storage.put(put);
+    storageAdmin.truncateTable(COORDINATOR_NAMESPACE, COORDINATOR_STATE_TABLE);
 
     // Act Assert
     assertThatThrownBy(

ledger/build.gradle

@@ -48,8 +48,6 @@ dependencies {
     implementation group: 'com.moandjiezana.toml', name: 'toml4j', version: "${toml4jVersion}"
     implementation group: 'info.picocli', name: 'picocli', version: "${picoCliVersion}"
     implementation group: 'io.github.resilience4j', name: 'resilience4j-retry', version: "${resilience4jRetryVersion}"
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}"
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
 
     // The following packages are provided for ScalarDL contracts in runtime
     implementation group: 'org.hashids', name: 'hashids', version: '1.0.3'