KAFKA 271 (#93)

* Update gradlew to 7.3.1

Added gradle.properties to support spotless / google format java via compile exports

Updated the following to support Java 17:

  * Spotless plugin
  * Spotbugs plugin
  * Buildconfig plugin
  * Junit 5 dependency
  * Mockito dependency
  * Hamcrest dependency

KAFKA-271

Author: rozza

.evergreen/config.yml

@@ -273,7 +273,7 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          JDK="${JDK}" .evergreen/run-unit-tests.sh
+          javaVersion="${javaVersion}" .evergreen/run-unit-tests.sh
 
   "run integration tests":
     - command: shell.exec
@@ -282,7 +282,7 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          MONGODB_URI="${MONGODB_URI}" JDK="${JDK}" .evergreen/run-integration-tests.sh
+          MONGODB_URI="${MONGODB_URI}" javaVersion="${javaVersion}" .evergreen/run-integration-tests.sh
 
   "publish snapshots":
     - command: shell.exec
@@ -378,13 +378,17 @@ axes:
         variables:
           TOPOLOGY: "replica_set"
 
-  - id: "jdk"
-    display_name: "JDK"
+  - id: "javaVersion"
+    display_name: "javaVersion"
     values:
-      - id: "jdk8"
+      - id: "JDK17"
+        display_name: "JDK17"
+        variables:
+          JAVA_VERSION: "17"
+      - id: "JDK8"
         display_name: "JDK8"
         variables:
-          JDK: "jdk8"
+          JAVA_VERSION: "8"
 
 buildvariants:
 
@@ -397,17 +401,17 @@ buildvariants:
       - name: "static-checks-task"
 
   - matrix_name: "Unit-tests"
-    matrix_spec: { jdk: "*", os: "*" }
-    display_name: "Units tests: ${jdk}"
+    matrix_spec: { javaVersion: "*", os: "*" }
+    display_name: "Units tests: ${javaVersion}"
     tags: ["unit-test"]
     run_on:
       - "ubuntu1804-test"
     tasks:
       - name: "unit-test-task"
 
   - matrix_name: "integration-tests"
-    matrix_spec: { jdk: "*", version: "*", topology: "*", os: "*" }
-    display_name: "Integration tests: ${jdk} ${version} ${topology} ${os}"
+    matrix_spec: { javaVersion: "*", version: "*", topology: "*", os: "*" }
+    display_name: "Integration tests: ${javaVersion} ${version} ${topology} ${os}"
     tags: ["integration-test"]
     run_on:
       - "ubuntu1804-test"

.evergreen/publish-snapshots.sh

@@ -12,9 +12,11 @@ trap "rm ${PROJECT_DIRECTORY}/secring.gpg; exit" EXIT HUP
 
 echo ${RING_FILE_GPG_BASE64} | base64 -d > ${PROJECT_DIRECTORY}/secring.gpg
 
-echo "Publishing snapshot with jdk8"
+echo "Publishing snapshot with JDK17"
 
-export JAVA_HOME="/opt/java/jdk8"
+export JDK8="/opt/java/jdk8"
+export JDK17="/opt/java/jdk17"
+export JAVA_HOME=$JDK17
 
 export ORG_GRADLE_PROJECT_nexusUsername=${NEXUS_USERNAME}
 export ORG_GRADLE_PROJECT_nexusPassword=${NEXUS_PASSWORD}

.evergreen/run-integration-tests.sh

@@ -4,19 +4,21 @@ set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with error if any of the commands fail
 
 # Supported/used environment variables:
-#       MONGODB_URI             Set the suggested connection MONGODB_URI (including credentials and topology info)
-#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java "jdk8"
-
+#  JAVA_VERSION            The version of java to use for the tests
+#  MONGODB_URI             Set the suggested connection MONGODB_URI (including credentials and topology info)
+JAVA_VERSION=${JAVA_VERSION:-17}
 MONGODB_URI=${MONGODB_URI:-}
-JDK=${JDK:-jdk}
-export JAVA_HOME="/opt/java/${JDK}"
+
+export JDK8="/opt/java/jdk8"
+export JDK17="/opt/java/jdk17"
+export JAVA_HOME=$JDK17
 
 ############################################
 #            Main Program                  #
 ############################################
 
 
-echo "Running tests with ${JDK} connecting to $MONGODB_URI"
+echo "Running tests connecting to $MONGODB_URI on JDK${JAVA_VERSION}"
 
 ./gradlew -version
-./gradlew -Dorg.mongodb.test.uri=${MONGODB_URI} --stacktrace --info integrationTest
+./gradlew -PjavaVersion=$JAVA_VERSION -Dorg.mongodb.test.uri=${MONGODB_URI} --stacktrace --info integrationTest

.evergreen/run-static-checks.sh

@@ -3,7 +3,9 @@
 set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with error if any of the commands fail
 
-export JAVA_HOME="/opt/java/jdk8"
+export JDK8="/opt/java/jdk8"
+export JDK17="/opt/java/jdk17"
+export JAVA_HOME=$JDK17
 
 ############################################
 #            Main Program                  #

.evergreen/run-unit-tests.sh

@@ -4,17 +4,19 @@ set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with error if any of the commands fail
 
 # Supported/used environment variables:
-#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java "jdk8"
+#  JAVA_VERSION The version of java to use for the tests
+JAVA_VERSION=${JAVA_VERSION:-17}
 
-JDK=${JDK:-jdk}
-export JAVA_HOME="/opt/java/${JDK}"
+export JDK8="/opt/java/jdk8"
+export JDK17="/opt/java/jdk17"
+export JAVA_HOME=$JDK17
 
 ############################################
 #            Main Program                  #
 ############################################
 
-
-echo "Running tests with ${JDK} connecting to $MONGODB_URI"
+echo "Running unit tests on JDK${JAVA_VERSION}"
 
 ./gradlew -version
-./gradlew --stacktrace --info test
+./gradlew -PjavaVersion=$JAVA_VERSION --stacktrace --info test
+

build.gradle.kts

@@ -32,24 +32,19 @@ plugins {
     `maven-publish`
     signing
     checkstyle
-    id("de.fuerstenau.buildconfig") version "1.1.8"
-    id("com.github.spotbugs") version "4.6.0"
-    id("com.diffplug.spotless") version "5.10.0"
+    id("com.github.gmazzo.buildconfig") version "3.0.3"
+    id("com.github.spotbugs") version "4.7.9"
+    id("com.diffplug.spotless") version "5.17.1"
     id("com.github.johnrengelman.shadow") version "6.1.0"
 }
 
 group = "org.mongodb.kafka"
 version = "1.7.0-SNAPSHOT"
 description = "The official MongoDB Apache Kafka Connect Connector."
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 repositories {
     mavenCentral()
-    maven("http://packages.confluent.io/maven/")
+    maven("https://packages.confluent.io/maven/")
     maven("https://jitpack.io")
 }
 
@@ -59,10 +54,10 @@ extra.apply {
     set("avroVersion", "1.9.2")
 
     // Testing dependencies
-    set("junitJupiterVersion", "5.4.0")
-    set("junitPlatformVersion", "1.4.0")
-    set("hamcrestVersion", "2.0.0.0")
-    set("mockitoVersion", "2.27.0")
+    set("junitJupiterVersion", "5.8.1")
+    set("junitPlatformVersion", "1.8.1")
+    set("hamcrestVersion", "2.2")
+    set("mockitoVersion", "4.0.0")
 
     // Integration test dependencies
     set("confluentVersion", "6.0.1")
@@ -85,9 +80,11 @@ dependencies {
     mongoAndAvroDependencies("org.apache.avro:avro:${project.extra["avroVersion"]}")
 
     // Unit Tests
-    testImplementation("org.junit.jupiter:junit-jupiter:${project.extra["junitJupiterVersion"]}")
-    testImplementation("org.junit.platform:junit-platform-runner:${project.extra["junitPlatformVersion"]}")
-    testImplementation("org.hamcrest:hamcrest-junit:${project.extra["hamcrestVersion"]}")
+    testImplementation(platform("org.junit:junit-bom:${project.extra["junitJupiterVersion"]}"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation("org.junit.platform:junit-platform-runner")
+    testImplementation("org.apiguardian:apiguardian-api:1.1.2") // https://github.com/gradle/gradle/issues/18627
+    testImplementation("org.hamcrest:hamcrest:${project.extra["hamcrestVersion"]}")
     testImplementation("org.mockito:mockito-junit-jupiter:${project.extra["mockitoVersion"]}")
 
     // Integration Tests
@@ -108,6 +105,14 @@ dependencies {
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
+    options.release.set(8)
+}
+
+val defaultJdkVersion = 17
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(defaultJdkVersion))
+    }
 }
 
 /*
@@ -123,18 +128,19 @@ val gitVersion: String by lazy {
 }
 
 buildConfig {
-    appName = "mongo-kafka"
-    version = gitVersion
-    clsName = "Versions"
-    packageName = "com.mongodb.kafka.connect"
+    className("Versions")
+    packageName("com.mongodb.kafka.connect")
+    useJavaOutput()
+    buildConfigField("String", "NAME", "\"mongo-kafka\"")
+    buildConfigField("String", "VERSION", provider { "\"${gitVersion}\"" })
 }
 
 /*
  * Testing
  */
+
 sourceSets.create("integrationTest") {
     java.srcDir("src/integrationTest/java")
-    resources.srcDir("src/integrationTest/resources")
     compileClasspath += sourceSets["main"].output + configurations["testRuntimeClasspath"]
     runtimeClasspath += output + compileClasspath + sourceSets["test"].runtimeClasspath
 }
@@ -155,6 +161,12 @@ tasks.withType<Test> {
         events("passed", "skipped", "failed")
     }
 
+    val javaVersion: Int = (project.findProperty("javaVersion") as String? ?: defaultJdkVersion.toString()).toInt()
+    logger.info("Running tests using JDK$javaVersion")
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion.set(JavaLanguageVersion.of(javaVersion))
+    })
+
     systemProperties(mapOf("org.mongodb.test.uri" to System.getProperty("org.mongodb.test.uri", "")))
 
     val jdkHome = project.findProperty("jdkHome") as String?
@@ -210,7 +222,7 @@ tasks.withType<com.github.spotbugs.snom.SpotBugsTask> {
 // Spotless is used to lint and reformat source files.
 spotless {
     java {
-        googleJavaFormat()
+        googleJavaFormat("1.12.0")
         importOrder("java", "io", "org", "org.bson", "com.mongodb", "com.mongodb.kafka", "")
         removeUnusedImports() // removes any unused imports
         trimTrailingWhitespace()

config/checkstyle/suppressions.xml

@@ -32,6 +32,9 @@
     <suppress checks="VisibilityModifier" files=".*RegExpSettings.java"/>
     <suppress checks="VisibilityModifier" files=".*RenameByRegExp.java"/>
 
+    <!-- Versions (generated code) -->
+    <suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]kafka[\\/]connect[\\/]Versions.java" />
+
     <!--Test code-->
     <suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]kafka[\\/]connect[\\/]avro[\\/]" />
     <suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]kafka[\\/]connect[\\/]embedded[\\/]" />

gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.java.installations.auto-download=false
+org.gradle.java.installations.fromEnv=JDK8,JDK17
+org.gradle.jvmargs=-XX:+HeapDumpOnOutOfMemoryError -Xmx1G --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

gradle/wrapper/gradle-wrapper.jar

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