Backport to branch(3) : Run integration test with a given Java version and vendor

build.gradle

@@ -16,6 +16,7 @@ subprojects {
 //    apply plugin: 'jacoco'
     apply plugin: 'java-library-distribution'
     apply plugin: 'com.diffplug.spotless'
+    apply plugin: 'com.scalar.db.jdk-configuration'
 
     project.version = '3.13.0-SNAPSHOT'
 
@@ -54,10 +55,9 @@ subprojects {
         log4jVersion = '2.23.1'
         stefanbirknerSystemLambdaVersion = '1.2.1'
         spotbugsPluginVersion = '5.2.5'
-        errorpronePluginVersion = '2.0.2'
+        errorpronePluginVersion = '3.1.0'
         protobufPluginVersion = '0.8.19'
         shadowPluginVersion = '7.1.2'
-        dockerPluginVersion = '0.34.0'
         // Make JDK11+ use the same version as JDK8 uses
         googleJavaFormatVersion = '1.7'
     }
@@ -71,9 +71,6 @@ subprojects {
         testLogging.showStandardStreams = true
     }
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-
     group = "com.scalar-labs"
 
     java {
@@ -99,3 +96,4 @@ subprojects {
         duplicatesStrategy DuplicatesStrategy.EXCLUDE
     }
 }
+

buildSrc/build.gradle

@@ -0,0 +1,26 @@
+plugins {
+    id 'java-gradle-plugin'
+    id 'com.diffplug.spotless' version '6.13.0'
+}
+
+repositories {
+    mavenCentral()
+}
+
+gradlePlugin {
+    plugins {
+        jdkConfiguration {
+            id = 'com.scalar.db.jdk-configuration'
+            implementationClass = 'com.scalar.db.JdkConfigurationPlugin'
+        }
+    }
+}
+
+spotless {
+    java {
+        target 'src/*/java/**/*.java'
+        importOrder()
+        removeUnusedImports()
+        googleJavaFormat("1.7")
+    }
+}

buildSrc/src/main/java/com/scalar/db/JdkConfigurationPlugin.java

@@ -0,0 +1,152 @@
+package com.scalar.db;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+import javax.annotation.Nullable;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.tasks.testing.Test;
+import org.gradle.jvm.toolchain.JavaLanguageVersion;
+import org.gradle.jvm.toolchain.JavaToolchainService;
+import org.gradle.jvm.toolchain.JvmVendorSpec;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Plugin configuring all tasks and integration test tasks to use a given JDK defined by the
+ * following Gradle properties:
+ *
+ * <ul>
+ *   <li>`javaVersion` : configure all Java related tasks to use the given JDK version. The default
+ *       java version 8.
+ *   <li>`javaVendor` : configure all Java related tasks to use the given JDK vendor. The default
+ *       java vendor is Adoptium (also known as Temurin).
+ *   <li>`integrationTestJavaRuntimeVersion` : configure all test tasks name starting with
+ *       "integrationTest" to run with the given JDK version. The default Java runtime version is 8.
+ *   <li>`integrationTestJavaRuntimeVendor` : configure all test tasks name starting with
+ *       "integrationTest" to run with the given JDK vendor. The default Java runtime vendor is
+ *       Adoptium (also known as Temurin).
+ * </ul>
+ *
+ * <p>Usage example using the CLI:
+ *
+ * <p>1. To use JDK 11 (amazon) for all Java tasks including integration tests
+ *
+ * <pre><code>
+ *   gradle integrationTestJdbc -PjavaVersion=11 -PjavaVendor=amazon
+ * </code></pre>
+ *
+ * 2. To use JDK 11 (amazon) for all Java tasks while having integration test use JDK 17 (microsoft)
+ *
+ * <pre><code>
+ *   gradle integrationTestJdbc -PjavaVersion=11 -PjavaVendor=amazon -PintegrationTestJavaRuntimeVersion=17 -PintegrationTestJavaRuntimeVendor=microsoft
+ * </code></pre>
+ */
+public class JdkConfigurationPlugin implements Plugin<Project> {
+
+  private static final Logger logger = LoggerFactory.getLogger(JdkConfigurationPlugin.class);
+  // JDK 8 (temurin) is used as default for all tasks (compilation, tests, etc.)
+  private static final JavaLanguageVersion DEFAULT_JAVA_VERSION = JavaLanguageVersion.of(8);
+  private static final JvmVendorSpec DEFAULT_JAVA_VENDOR = JvmVendorSpec.ADOPTIUM;
+
+  private static final String JAVA_VERSION_PROP = "javaVersion";
+  private static final String JAVA_VENDOR_PROP = "javaVendor";
+  private static final String INTEGRATION_TEST_JAVA_RUNTIME_VERSION_PROP =
+      "integrationTestJavaRuntimeVersion";
+  private static final String INTEGRATION_TEST_JAVA_RUNTIME_VENDOR_PROP =
+      "integrationTestJavaRuntimeVendor";
+
+  private JavaLanguageVersion javaVersion = DEFAULT_JAVA_VERSION;
+  private JvmVendorSpec javaVendor = DEFAULT_JAVA_VENDOR;
+  @Nullable private JavaLanguageVersion integrationTestJavaVersion;
+  @Nullable private JvmVendorSpec integrationTestJavaVendor;
+
+  @Override
+  public void apply(@NotNull Project project) {
+    parseIntegrationTestInputProperties(project);
+    configureJdkForAllJavaTasks(project);
+    configureJdkForIntegrationTestTasks(project);
+  }
+
+  private void configureJdkForAllJavaTasks(Project project) {
+    JavaPluginExtension javaPlugin = project.getExtensions().getByType(JavaPluginExtension.class);
+    javaPlugin.getToolchain().getLanguageVersion().set(javaVersion);
+    javaPlugin.getToolchain().getVendor().set(javaVendor);
+    logger.debug("Configure JDK {} ({}) for Java tasks", javaVersion, javaVendor);
+  }
+
+  private void configureJdkForIntegrationTestTasks(Project project) {
+    if (integrationTestJavaVersion == null) {
+      return;
+    }
+    project
+        .getTasks()
+        .withType(Test.class)
+        .matching(testTask -> testTask.getName().startsWith("integrationTest"))
+        .configureEach(
+            integrationTestTask ->
+                integrationTestTask
+                    .getJavaLauncher()
+                    .set(
+                        getJavaToolchainService(project)
+                            .launcherFor(
+                                config -> {
+                                  config.getLanguageVersion().set(integrationTestJavaVersion);
+                                  logger.debug(
+                                      "Configure task '{}' to use JDK version {}",
+                                      integrationTestTask.getName(),
+                                      integrationTestJavaVersion);
+                                  if (integrationTestJavaVendor != null) {
+                                    config.getVendor().set(integrationTestJavaVendor);
+                                    logger.debug(
+                                        "Configure task '{}' to use {} JDK vendor",
+                                        integrationTestTask.getName(),
+                                        integrationTestJavaVendor);
+                                  }
+                                })));
+  }
+
+  private void parseIntegrationTestInputProperties(Project project) {
+    parseVersionInputProperty(project, JAVA_VERSION_PROP, (version) -> javaVersion = version);
+    parseVendorInputProperty(project, JAVA_VENDOR_PROP, (vendor) -> javaVendor = vendor);
+    parseVersionInputProperty(
+        project,
+        INTEGRATION_TEST_JAVA_RUNTIME_VERSION_PROP,
+        (version) -> integrationTestJavaVersion = version);
+    parseVendorInputProperty(
+        project,
+        INTEGRATION_TEST_JAVA_RUNTIME_VENDOR_PROP,
+        (vendor) -> integrationTestJavaVendor = vendor);
+  }
+
+  private void parseVersionInputProperty(
+      Project project, String property, Consumer<JavaLanguageVersion> attributeSetter) {
+    if (project.hasProperty(property)) {
+      attributeSetter.accept(JavaLanguageVersion.of(Objects.toString(project.property(property))));
+    }
+  }
+
+  private void parseVendorInputProperty(
+      Project project, String property, Consumer<JvmVendorSpec> attributeSetter) {
+    if (!project.getRootProject().hasProperty(property)) {
+      return;
+    }
+    String propertyValue = Objects.toString(project.property(property));
+    switch (propertyValue) {
+      case "corretto":
+        attributeSetter.accept(JvmVendorSpec.AMAZON);
+        break;
+      case "temurin":
+        attributeSetter.accept(JvmVendorSpec.ADOPTIUM);
+        break;
+      default:
+        attributeSetter.accept(JvmVendorSpec.matching(propertyValue));
+    }
+  }
+
+  private @NotNull JavaToolchainService getJavaToolchainService(Project project) {
+    return project.getExtensions().getByType(JavaToolchainService.class);
+  }
+}

core/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'net.ltgt.errorprone' version "${errorpronePluginVersion}"
     id 'maven-publish'
     id 'signing'
+    id 'base'
 }
 
 sourceSets {
@@ -128,15 +129,14 @@ javadoc {
     title = "ScalarDB"
 }
 
-
 task integrationTestCassandra(type: Test) {
     description = 'Runs the integration tests for Cassandra.'
     group = 'verification'
     testClassesDirs = sourceSets.integrationTestCassandra.output.classesDirs
     classpath = sourceSets.integrationTestCassandra.runtimeClasspath
     outputs.upToDateWhen { false }  // ensures integration tests are run every time when called
     options {
-        systemProperties(System.getProperties())
+        systemProperties(System.getProperties().findAll{it.key.toString().startsWith("scalardb")})
     }
 }
 
@@ -147,7 +147,7 @@ task integrationTestCosmos(type: Test) {
     classpath = sourceSets.integrationTestCosmos.runtimeClasspath
     outputs.upToDateWhen { false }  // ensures integration tests are run every time when called
     options {
-        systemProperties(System.getProperties())
+        systemProperties(System.getProperties().findAll{it.key.toString().startsWith("scalardb")})
     }
     maxParallelForks = 3
     jvmArgs '-XX:MaxDirectMemorySize=4g', '-Xmx4g'
@@ -160,7 +160,7 @@ task integrationTestDynamo(type: Test) {
     classpath = sourceSets.integrationTestDynamo.runtimeClasspath
     outputs.upToDateWhen { false }  // ensures integration tests are run every time when called
     options {
-        systemProperties(System.getProperties())
+        systemProperties(System.getProperties().findAll{it.key.toString().startsWith("scalardb")})
     }
     maxParallelForks = 10
 }
@@ -172,7 +172,7 @@ task integrationTestJdbc(type: Test) {
     classpath = sourceSets.integrationTestJdbc.runtimeClasspath
     outputs.upToDateWhen { false }  // ensures integration tests are run every time when called
     options {
-        systemProperties(System.getProperties())
+        systemProperties(System.getProperties().findAll{it.key.toString().startsWith("scalardb")})
     }
 }
 
@@ -183,7 +183,7 @@ task integrationTestMultiStorage(type: Test) {
     classpath = sourceSets.integrationTestMultiStorage.runtimeClasspath
     outputs.upToDateWhen { false }  // ensures integration tests are run every time when called
     options {
-        systemProperties(System.getProperties())
+        systemProperties(System.getProperties().findAll{it.key.toString().startsWith("scalardb")})
     }
 }
 
@@ -229,7 +229,9 @@ check.dependsOn += spotbugsMain
 check.dependsOn += spotbugsTest
 check.dependsOn += spotbugsIntegrationTest
 
-archivesBaseName = "scalardb"
+base {
+    archivesName = "scalardb"
+}
 
 // for archiving and uploading to maven central
 publishing {

docs/getting-started/build.gradle

@@ -6,7 +6,7 @@ repositories {
     mavenCentral()
 }
 
-mainClassName = "sample.ElectronicMoneyMain"
+mainClass = "sample.ElectronicMoneyMain"
 
 dependencies {
     implementation 'com.scalar-labs:scalardb:3.12.2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

integration-test/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'net.ltgt.errorprone' version "${errorpronePluginVersion}"
     id 'maven-publish'
     id 'signing'
+    id 'base'
 }
 
 dependencies {
@@ -52,7 +53,9 @@ spotbugsTest.reports {
 }
 spotbugsTest.excludeFilter = file("${project.rootDir}/gradle/spotbugs-exclude.xml")
 
-archivesBaseName = "scalardb-integration-test"
+base {
+    archivesName = "scalardb-integration-test"
+}
 
 // for archiving and uploading to maven central
 publishing {