Building bookkeeper with gradle on java11

build.gradle

@@ -73,6 +73,7 @@ allprojects {
         checkstyle {
             toolVersion "${checkStyleVersion}"
             configFile file("$rootDir/buildtools/src/main/resources/bookkeeper/checkstyle.xml")
+            configDirectory = file("$rootDir/buildtools/src/main/resources/bookkeeper")
             checkstyleMain {
                 source ='src/main/java'
             }

buildtools/src/main/resources/bookkeeper/checkstyle.xml

@@ -60,7 +60,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
         <property name="checkFormat" value="$1"/>
     </module>
     <module name="SuppressionFilter">
-        <property name="file" value="${checkstyle.suppressions.file}" default="./buildtools/src/main/resources/bookkeeper/suppressions.xml" />
+        <property name="file" value="${config_loc}/suppressions.xml" default="./buildtools/src/main/resources/bookkeeper/suppressions.xml" />
     </module>
 
     <!-- Check that every module has a package-info.java -->

circe-checksum/build.gradle

@@ -28,14 +28,8 @@ dependencies {
     testImplementation depLibs.mockito
 }
 
-task generateJniHeaders(type:Exec) {
-    ext {
-        javahOutputDir = "$buildDir/javahGenerated"
-    }
-    dependsOn classes
-    def classpath = sourceSets.main.output.classesDirs.join(":")
-    commandLine("javah", "-d", javahOutputDir, "-classpath",
-                classpath, "com.scurrilous.circe.crc.Sse42Crc32C")
+compileJava {
+    options.headerOutputDirectory = file("${buildDir}/javahGenerated")
 }
 
 jar {

circe-checksum/src/main/circe/build.gradle

@@ -27,9 +27,9 @@ library {
 
     binaries.configureEach { CppBinary binary ->
         def compileTask = binary.compileTask.get()
-        compileTask.dependsOn project(':circe-checksum').generateJniHeaders
+        compileTask.dependsOn project(':circe-checksum').compileJava
         compileTask.includes.from("${Jvm.current().javaHome}/include",
-                                  project(':circe-checksum').generateJniHeaders.javahOutputDir)
+                                  project(':circe-checksum').compileJava.options.headerOutputDirectory)
 
         def osFamily = binary.targetPlatform.targetMachine.operatingSystemFamily
 

cpu-affinity/build.gradle

@@ -16,29 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 plugins {
     id 'java'
 }
 
 dependencies {
-    compileOnly depLibs.lombok
     compileOnly depLibs.spotbugsAnnotations
     implementation depLibs.commonsLang3
     implementation depLibs.guava
     implementation depLibs.slf4j
     testImplementation depLibs.junit
-
+    compileOnly depLibs.lombok
     annotationProcessor depLibs.lombok
+    testCompileOnly depLibs.lombok
+    testAnnotationProcessor depLibs.lombok
 }
 
-task generateJniHeaders(type:Exec) {
-    ext {
-        javahOutputDir = "$buildDir/javahGenerated"
-    }
-    dependsOn classes
-    def classpath = sourceSets.main.output.classesDirs.join(":")
-    commandLine("javah", "-d", javahOutputDir, "-classpath",
-                classpath, "org.apache.bookkeeper.common.util.affinity.impl.CpuAffinityJni")
+compileJava {
+    options.headerOutputDirectory = file("${buildDir}/javahGenerated")
 }
 
 jar {

cpu-affinity/src/main/affinity/build.gradle

@@ -25,9 +25,9 @@ plugins {
 library {
     binaries.configureEach { CppBinary binary ->
         def compileTask = binary.compileTask.get()
-        compileTask.dependsOn project(':cpu-affinity').generateJniHeaders
+        compileTask.dependsOn project(':cpu-affinity').compileJava
         compileTask.includes.from("${Jvm.current().javaHome}/include",
-                                  project(':cpu-affinity').generateJniHeaders.javahOutputDir)
+                                  project(':cpu-affinity').compileJava.options.headerOutputDirectory)
 
         def osFamily = binary.targetPlatform.targetMachine.operatingSystemFamily
 

dependencies.gradle

@@ -48,6 +48,7 @@ depVersions = [
     hdrhistogram: "2.1.4",
     httpclient: "4.5.13",
     jackson: "2.11.1",
+    javaAnnotations:"1.3.2",
     jcommander: "1.78",
     jctools: "2.1.2",
     jetty: "9.4.31.v20200723",
@@ -111,6 +112,7 @@ depLibs = [
     hamcrest: "org.hamcrest:hamcrest-all:${depVersions.hamcrest}",
     httpclient: "org.apache.httpcomponents:httpclient:${depVersions.httpclient}",
     jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:${depVersions.jackson}",
+    javaAnnotations: "javax.annotation:javax.annotation-api:${depVersions.javaAnnotations}",
     jacksonCore: "com.fasterxml.jackson.core:jackson-core:${depVersions.jackson}",
     jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:${depVersions.jackson}",
     jcommander: "com.beust:jcommander:${depVersions.jcommander}",

stream/distributedlog/core/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     testImplementation project(path: ':stream:distributedlog:common', configuration: 'testArtifacts')
     testImplementation depLibs.junit
     testImplementation depLibs.mockito
+    implementation depLibs.javaAnnotations
 
     annotationProcessor depLibs.lombok
     testAnnotationProcessor depLibs.lombok

stream/proto/build.gradle

@@ -25,6 +25,7 @@ dependencies {
     implementation depLibs.lombok
     implementation depLibs.grpc
     implementation depLibs.commonsLang3
+    implementation depLibs.javaAnnotations
 
     annotationProcessor depLibs.lombok
 }

stream/server/build.gradle

@@ -55,6 +55,7 @@ dependencies {
     runtimeOnly depLibs.vertxCore
     runtimeOnly depLibs.vertxWeb
     testImplementation depLibs.mockito
+    implementation depLibs.javaAnnotations
 
     annotationProcessor depLibs.lombok
 }

stream/tests-common/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation depLibs.slf4j
 
     annotationProcessor depLibs.lombok
+    implementation depLibs.javaAnnotations
 }
 
 protobuf {