[NOID] Upgrades gradle version

LICENSES.txt

@@ -119,15 +119,15 @@ Apache-2.0
   jcip-annotations-1.0-1.jar
   jctools-core-3.3.0.jar
   jettison-1.5.4.jar
-  jetty-http-9.4.52.v20230823.jar
-  jetty-io-9.4.52.v20230823.jar
-  jetty-security-9.4.52.v20230823.jar
-  jetty-server-9.4.52.v20230823.jar
-  jetty-servlet-9.4.52.v20230823.jar
-  jetty-util-9.4.52.v20230823.jar
-  jetty-util-ajax-9.4.52.v20230823.jar
-  jetty-webapp-9.4.52.v20230823.jar
-  jetty-xml-9.4.52.v20230823.jar
+  jetty-http-9.4.53.v20231009.jar
+  jetty-io-9.4.53.v20231009.jar
+  jetty-security-9.4.53.v20231009.jar
+  jetty-server-9.4.53.v20231009.jar
+  jetty-servlet-9.4.53.v20231009.jar
+  jetty-util-9.4.53.v20231009.jar
+  jetty-util-ajax-9.4.53.v20231009.jar
+  jetty-webapp-9.4.53.v20231009.jar
+  jetty-xml-9.4.53.v20231009.jar
   jffi-1.2.16-native.jar
   jffi-1.2.16.jar
   jmespath-java-1.12.425.jar

NOTICE.txt

@@ -149,15 +149,15 @@ Apache-2.0
   jcip-annotations-1.0-1.jar
   jctools-core-3.3.0.jar
   jettison-1.5.4.jar
-  jetty-http-9.4.52.v20230823.jar
-  jetty-io-9.4.52.v20230823.jar
-  jetty-security-9.4.52.v20230823.jar
-  jetty-server-9.4.52.v20230823.jar
-  jetty-servlet-9.4.52.v20230823.jar
-  jetty-util-9.4.52.v20230823.jar
-  jetty-util-ajax-9.4.52.v20230823.jar
-  jetty-webapp-9.4.52.v20230823.jar
-  jetty-xml-9.4.52.v20230823.jar
+  jetty-http-9.4.53.v20231009.jar
+  jetty-io-9.4.53.v20231009.jar
+  jetty-security-9.4.53.v20231009.jar
+  jetty-server-9.4.53.v20231009.jar
+  jetty-servlet-9.4.53.v20231009.jar
+  jetty-util-9.4.53.v20231009.jar
+  jetty-util-ajax-9.4.53.v20231009.jar
+  jetty-webapp-9.4.53.v20231009.jar
+  jetty-xml-9.4.53.v20231009.jar
   jffi-1.2.16-native.jar
   jffi-1.2.16.jar
   jmespath-java-1.12.425.jar
@@ -341,15 +341,15 @@ Eclipse Distribution License - v 1.0
 Eclipse Public License - Version 1.0
   javax-websocket-client-impl-9.4.51.v20230217.jar
   javax-websocket-server-impl-9.4.51.v20230217.jar
-  jetty-http-9.4.52.v20230823.jar
-  jetty-io-9.4.52.v20230823.jar
-  jetty-security-9.4.52.v20230823.jar
-  jetty-server-9.4.52.v20230823.jar
-  jetty-servlet-9.4.52.v20230823.jar
-  jetty-util-9.4.52.v20230823.jar
-  jetty-util-ajax-9.4.52.v20230823.jar
-  jetty-webapp-9.4.52.v20230823.jar
-  jetty-xml-9.4.52.v20230823.jar
+  jetty-http-9.4.53.v20231009.jar
+  jetty-io-9.4.53.v20231009.jar
+  jetty-security-9.4.53.v20231009.jar
+  jetty-server-9.4.53.v20231009.jar
+  jetty-servlet-9.4.53.v20231009.jar
+  jetty-util-9.4.53.v20231009.jar
+  jetty-util-ajax-9.4.53.v20231009.jar
+  jetty-webapp-9.4.53.v20231009.jar
+  jetty-xml-9.4.53.v20231009.jar
   websocket-api-9.4.51.v20230217.jar
   websocket-client-9.4.51.v20230217.jar
   websocket-common-9.4.51.v20230217.jar

build.gradle

@@ -1,10 +1,8 @@
 plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '4.0.3'  apply false
-    id "com.bmuschko.nexus" version "2.3.1"
+    id 'java'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'  apply false
     id 'maven-publish'
-    id "org.sonarqube" version "2.7"
-    id "com.github.hierynomus.license-report" version"0.15.0"
+    id "com.github.hierynomus.license-report" version"0.16.1"
 }
 
 downloadLicenses {
@@ -16,11 +14,14 @@ downloadLicenses {
 allprojects {
     group = 'org.neo4j.procedure'
     version = '4.4.0.23'
-    archivesBaseName = 'apoc'
+    base {
+        archivesName = 'apoc'
+    }
     description = """neo4j-apoc-procedures"""
 }
 
 apply plugin: 'java-library'
+
 if (System.env.CI != null)
     apply from: 'teamcity-repository.gradle'
 
@@ -59,7 +60,8 @@ subprojects {
 
     task mySourcesJar(type: Jar) {
         from sourceSets.main.allJava
-        classifier = 'sources'
+        archiveClassifier = 'sources'
+        dependsOn(':full:generateGrammarSource')
     }
 
     task myJavadocJar(type: Jar) {

core/build.gradle

@@ -1,8 +1,7 @@
 plugins {
     id 'java'
-    id "com.bmuschko.nexus"
     id 'maven-publish'
-    id "org.sonarqube"
+    id 'com.github.johnrengelman.shadow' apply true
     id "com.diffplug.spotless" version "6.7.2"
 }
 
@@ -13,13 +12,13 @@ spotless {
     }
 }
 
-archivesBaseName = "apoc"
-
-apply plugin: 'com.github.johnrengelman.shadow'
+base {
+    archivesName = "apoc"
+}
 
 jar {
     manifest {
-        attributes 'Implementation-Version': version
+        attributes 'Implementation-Version': archiveVersion
     }
 }
 
@@ -40,54 +39,54 @@ javadoc {
 
 dependencies {
 
-    testCompile project(':test-utils')
+    testImplementation project(':test-utils')
     apt project(':processor')
 
     apt group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective
-    compile group: 'commons-codec', name: 'commons-codec', version: '1.14'
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
     // when json-path is changed, it have to be changed in json-path-version version in antora.yml as well.
-    compile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
-    compile group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9'
+    implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
+    implementation group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9'
 
     // compileOnly "org.antlr:antlr4-runtime:4.7.2"
     // testCompile "org.antlr:antlr4-runtime:4.7.2"
 
-    compile group: 'org.roaringbitmap', name: 'RoaringBitmap', version: '0.7.17'
-    compile(group: 'org.apache.commons', name: 'commons-configuration2', version: '2.9.0') {
+    implementation group: 'org.roaringbitmap', name: 'RoaringBitmap', version: '0.7.17'
+    implementation(group: 'org.apache.commons', name: 'commons-configuration2', version: '2.9.0') {
         exclude group: "org.yaml"
         exclude module: "snakeyaml"
         exclude module: "commons-lang3"
         exclude module: "commons-text"
     }
 
     // This was reported here https://github.com/neo4j-contrib/neo4j-apoc-procedures/issues/3048
-    compile(group: 'org.apache.commons', name: 'commons-lang3') {
+    implementation(group: 'org.apache.commons', name: 'commons-lang3') {
         version {
             strictly '3.12.0'
         }
     }
-    compile group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'
-    testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
+    implementation group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'
+    testImplementation group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
 
-    testCompile 'net.sourceforge.jexcelapi:jxl:2.6.12'
+    testImplementation 'net.sourceforge.jexcelapi:jxl:2.6.12'
 
     compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.425'
 
-    testCompile group: 'org.reflections', name: 'reflections', version: '0.9.12'
-    testCompile group: 'junit', name: 'junit', version: '4.13.1'
-    testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
-    testCompile group: 'org.neo4j.test', name: 'neo4j-harness', version: neo4jVersionEffective
-    testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.22.v20170606'
-    testCompile group: 'org.apache.derby', name: 'derby', version: '10.14.2.0'
+    testImplementation group: 'org.reflections', name: 'reflections', version: '0.9.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
+    testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
+    testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
+    testImplementation group: 'org.neo4j.test', name: 'neo4j-harness', version: neo4jVersionEffective
+    testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.22.v20170606'
+    testImplementation group: 'org.apache.derby', name: 'derby', version: '10.14.2.0'
 
-    testCompile group: 'org.neo4j', name: 'neo4j-common', version: neo4jVersionEffective, classifier: "tests"
-    testCompile group: 'org.neo4j.community', name: 'it-test-support', version: neo4jVersionEffective // , classifier: "tests"
-    testCompile group: 'org.neo4j', name: 'log-test-utils', version: neo4jVersionEffective // , classifier: "tests"
+    testImplementation group: 'org.neo4j', name: 'neo4j-common', version: neo4jVersionEffective, classifier: "tests"
+    testImplementation group: 'org.neo4j.community', name: 'it-test-support', version: neo4jVersionEffective // , classifier: "tests"
+    testImplementation group: 'org.neo4j', name: 'log-test-utils', version: neo4jVersionEffective // , classifier: "tests"
 
 
-    testCompile group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"
-    testCompile group: 'org.neo4j', name: 'neo4j-io', version: neo4jVersionEffective, classifier: "tests"
+    testImplementation group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"
+    testImplementation group: 'org.neo4j', name: 'neo4j-io', version: neo4jVersionEffective, classifier: "tests"
 
 
     def withoutServers = {
@@ -103,46 +102,46 @@ dependencies {
 
     compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective
 
-    testCompile 'org.mock-server:mockserver-netty:5.15.0'
-    testCompile 'org.mock-server:mockserver-client-java:5.15.0'
+    testImplementation 'org.mock-server:mockserver-netty:5.15.0'
+    testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
 
     compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
     testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.353' , withoutJacksons
 
-    compile group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
-    compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
+    implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
+    implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
     compileOnly group: 'org.ow2.asm', name: 'asm', version: '5.0.2'
 
-    testCompile group: 'org.apache.hive', name: 'hive-jdbc', version: '1.2.2', withoutServers
+    testImplementation group: 'org.apache.hive', name: 'hive-jdbc', version: '1.2.2', withoutServers
 
     compileOnly group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.6', withoutServers
     // If updated check if the transitive dependency to javax.servlet.jsp:jsp-api:2.1 has also updated
     // and remove the manual licensing check for it in licenses-3rdparties.gradle
     compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.6', withoutServers
 
-    compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
+    implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
     // explicit update comomns.io version
-    compile group: 'commons-io', name: 'commons-io', version: '2.9.0'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.9.0'
 
     compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
-    testCompile group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
+    testImplementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
 //    jmh group: 'org.neo4j', name: 'neo4j-lucene-index', version: neo4jVersionEffective
 //    jmh group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"
 
-    testCompile group: 'org.xmlunit', name: 'xmlunit-core', version: '2.2.1'
-    testCompile group: 'com.github.adejanovski', name: 'cassandra-jdbc-wrapper', version: '3.1.0'
+    testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.2.1'
+    testImplementation group: 'com.github.adejanovski', name: 'cassandra-jdbc-wrapper', version: '3.1.0'
 
-    testCompile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
+    testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
 
     compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.22.3'
-    testCompile group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.22.3', {
+    testImplementation group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.22.3', {
         exclude group: 'com.google.guava', module: 'guava'
     }
 
-    compile group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
 
-    compile group: 'xerces', name: 'xercesImpl', version: '2.12.2'
+    implementation group: 'xerces', name: 'xercesImpl', version: '2.12.2'
 
     def arrowExclusions = {
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -152,33 +151,18 @@ dependencies {
         exclude group: 'io.netty', module: 'netty-buffer'
     }
 
-    compile group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1', arrowExclusions
-    compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1', arrowExclusions
+    implementation group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1', arrowExclusions
+    implementation group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1', arrowExclusions
 
-    testCompile group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1'
-    testCompile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1'
+    testImplementation group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1'
+    testImplementation group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1'
 
     configurations.all {
         exclude group: 'org.slf4j', module: 'slf4j-nop'
     }
 }
 
-
-// tweaks for CI
-if (System.env.CI == 'true') {
-  allprojects {
-    tasks.withType(GroovyCompile) {
-      groovyOptions.fork = false
-    }
-    tasks.withType(Test) {
-      // containers (currently) have 2 dedicated cores and 4GB of memory
-      maxParallelForks = 2
-      minHeapSize = '128m'
-    }
-  }
-}
-
 task copyRuntimeLibs(type: Copy) {
     into "lib"
-    from configurations.testRuntime 
+    from configurations.testRuntimeOnly
 }