Merge pull request #147 from datastax/gradle-8.1

Upgrade gradle to 8.1

Author: lhotari

agent-c3/build.gradle

@@ -8,10 +8,8 @@ plugins {
 }
 
 application {
-    mainClassName = "$mainClassName"
+    mainClass = "$mainClassName"
 }
-configurations.implementation.canBeResolved = true
-configurations.compileOnly.canBeResolved = true
 
 jar {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE

agent-c4/build.gradle

@@ -8,11 +8,9 @@ plugins {
 }
 
 application {
-    mainClassName = "$mainClassName"
+    mainClass = "$mainClassName"
 }
 
-configurations.implementation.canBeResolved = true
-configurations.compileOnly.canBeResolved = true
 jar {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
     manifest {
@@ -82,7 +80,7 @@ test {
     systemProperty "projectVersion", project.version
 }
 
-dockerPrepare.dependsOn(shadowJar)
+dockerPrepare.dependsOn(jar, shadowJar)
 docker {
     name "${dockerRepo}cassandra:${cassandra4Version}-cdc"
     files "$buildDir/libs/", "src/docker/"

agent-dse4/build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 application {
-    mainClassName = "$mainClassName"
+    mainClass = "$mainClassName"
 }
 
 jar {
@@ -90,7 +90,7 @@ shadowJar {
 jar.enabled = true
 assemble.dependsOn(shadowJar)
 
-dockerPrepare.dependsOn(shadowJar)
+dockerPrepare.dependsOn(jar, shadowJar)
 docker {
     name "${dockerRepo}dse4-server:${dse4Version}-cdc"
     files "$buildDir/libs/", "src/docker/"

agent/build.gradle

@@ -16,8 +16,13 @@ dependencies {
     implementation("${pulsarGroup}:pulsar-client:${pulsarVersion}")
 }
 
+test {
+    // see https://junit-pioneer.org/docs/environment-variables/#warnings-for-reflective-access
+    jvmArgs "--add-opens=java.base/java.util=ALL-UNNAMED"
+}
+
 // generate agent parameters documentation
 application {
-    mainClassName = "com.datastax.oss.cdc.agent.AgentConfig"
+    mainClass = "com.datastax.oss.cdc.agent.AgentConfig"
 }
 

backfill-cli/build.gradle

@@ -105,7 +105,7 @@ tasks.register('nar', Zip) {
     dependsOn shadowJar
 
     // bundle the shadow jar as is
-    from(shadowJar.archivePath) {
+    from(shadowJar.archiveFile) {
         into "META-INF/bundled-dependencies"
     }
 
@@ -121,8 +121,8 @@ tasks.register('nar', Zip) {
     // explicitly include all files in the resources folder, otherwise the shadowJar will not include them
     sourceSets.main.resources.include("**/*")
 
-    archiveName "pulsar-cassandra-admin-${project.version}-nar.nar"
-    destinationDir file("${buildDir}/libs")
+    archiveFileName = "pulsar-cassandra-admin-${project.version}-nar.nar"
+    destinationDirectory = file("${buildDir}/libs")
 }
 
 assemble.dependsOn(nar)

build.gradle

@@ -5,7 +5,6 @@ plugins {
     id 'java'
     id 'idea'
     id 'application'
-    id "net.ltgt.apt-idea" version "0.21"
     id "com.dorongold.task-tree" version "2.1.0"
     id "jacoco"
     id "com.gorylenko.gradle-git-properties" version "2.3.1"
@@ -16,15 +15,14 @@ plugins {
     id 'com.github.jk1.dependency-license-report'
     id "com.github.johnrengelman.shadow" apply false
     id "io.github.lhotari.gradle-nar-plugin" apply false
-    id 'com.palantir.docker' version '0.30.0' apply false
+    id 'com.palantir.docker' version '0.35.0' apply false
     id 'docker-compose' apply false
 }
 
 allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        jcenter() // or Maven central, required for Lombok dependency
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         maven { url "https://packages.confluent.io/maven/" }
         maven { url "https://repo.typesafe.com/typesafe/releases/" }
@@ -112,9 +110,9 @@ subprojects {
 
     jacocoTestReport {
         reports {
-            html.enabled = true
-            xml.enabled = true
-            csv.enabled = false
+            html.required = true
+            xml.required = true
+            csv.required = false
         }
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Tue Jan 12 12:33:20 CET 2021
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

settings.gradle

@@ -7,11 +7,6 @@ buildscript {
         classpath "io.github.lhotari.gradle-nar-plugin:gradle-nar-plugin:0.5.1"
         classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
         classpath "com.avast.gradle:gradle-docker-compose-plugin:0.14.9"
-
-        // workaround for issue https://github.com/n0mer/gradle-git-properties/issues/195
-        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r") {
-            force = true
-        }
     }
 }