Fixed Javanica build.gradle

Author: tweimer

hystrix-contrib/hystrix-javanica/build.gradle

@@ -1,11 +1,19 @@
+plugins {
+    id 'java'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 configurations {
     ajtools
     ajcTestImplementation.extendsFrom testCompileClasspath
     ajcTestRuntimeOnly.extendsFrom testRuntimeClasspath
     ajc
 }
 
-
 sourceSets {
     ajcTest {
         compileClasspath += main.output + test.output
@@ -21,42 +29,45 @@ sourceSets {
     }
 }
 
-
-
 compileAjcTestJava {
-
     doLast {
-        ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: configurations.ajtools.asPath)
-        ant.iajc(source: "1.8", target: "1.8",
-                destDir: "${sourceSets.ajcTest.output.classesDirs.files.first().absolutePath}", maxmem: "512m", fork: "true",
-                classpath: "${sourceSets.main.output.classesDirs.files.first()absolutePath};${configurations.testCompileClasspath.asPath}")
-                {
-                    sourceroots {
+        ant.taskdef(
+                resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
+                classpath: configurations.ajtools.asPath
+        )
+        ant.iajc(
+                source: "17", target: "17",
+                destDir: "${sourceSets.ajcTest.output.classesDirs.files.first().absolutePath}",
+                maxmem: "512m", fork: "true",
+                classpath: "${sourceSets.main.output.classesDirs.files.first().absolutePath};${configurations.testCompileClasspath.asPath}"
+        ) {
+            sourceroots {
                         files("src/ajcTest/java/com/netflix/hystrix/contrib/javanica/test/aspectj", "src/test/java/com/netflix/hystrix/contrib/javanica/test/common", "src/main/java/com/netflix/hystrix/contrib/javanica/aop/aspectj").each {
                             File file -> pathelement(location: file.absolutePath)
-                        }
-                    }
                 }
+            }
+        }
     }
-
 }
 
 compileAjcJava {
-
     doLast {
-        ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: configurations.ajtools.asPath)
-        ant.iajc(source: "${sourceCompatibility}", target: "${targetCompatibility}",
-                destDir: "${sourceSets.ajc.output.classesDirs.files.first().absolutePath}", maxmem: "512m", fork: "true", "showWeaveInfo": "true",
-                classpath: "${configurations.compileClasspath.asPath}")
-
-                {
-                    sourceroots {
-                        sourceSets.ajc.java.srcDirs.each {
-                            pathelement(location: it.absolutePath)
-
-                        }
-                    }
+        ant.taskdef(
+                resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
+                classpath: configurations.ajtools.asPath
+        )
+        ant.iajc(
+                source: "${sourceCompatibility}", target: "${targetCompatibility}",
+                destDir: "${sourceSets.ajc.output.classesDirs.files.first().absolutePath}",
+                maxmem: "512m", fork: "true", "showWeaveInfo": "true",
+                classpath: "${configurations.compileClasspath.asPath}"
+        ) {
+            sourceroots {
+                sourceSets.ajc.java.srcDirs.each {
+                    pathelement(location: it.absolutePath)
                 }
+            }
+        }
     }
 }
 
@@ -71,13 +82,11 @@ task ajcTest(type: Test) {
 
 check.dependsOn test, ajcTest
 
-
 ext {
     aspectjVersion = '1.8.6'
     springframeworkVesion = '4.3.2.RELEASE'
 }
 
-
 task ajcJar(type: Jar) {
     archiveFileName = "${project.name}" + "-ctw-${version}.jar"
     destinationDirectory = file("${buildDir}/libs")