Fix build script to run with Gradle 7 (#432)

Update the Gradle wrapper used to version 7.2 and fixed build.gradle script.

Co-authored-by: João Duarte <[email protected]>

Author: andsel

CHANGELOG.md

@@ -1,3 +1,6 @@
+## Unreleased
+ - Fix: update to Gradle 7 [#432](https://github.com/logstash-plugins/logstash-input-beats/pull/432)
+
 ## 6.2.1
  - Fix: LS failing with `ssl_peer_metadata => true` [#431](https://github.com/logstash-plugins/logstash-input-beats/pull/431)
  - [DOC] described `executor_threads` configuration parameter [#421](https://github.com/logstash-plugins/logstash-input-beats/pull/421)

build.gradle

@@ -21,16 +21,16 @@ repositories {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'org.apache.logging.log4j:log4j-core:2.11.1'
-    compile 'io.netty:netty-all:4.1.65.Final'
-    compile 'org.javassist:javassist:3.24.0-GA'
-    compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-    compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-    compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
-    compile "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}"
-    compile 'org.apache.logging.log4j:log4j-api:2.11.1'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.hamcrest:hamcrest-library:1.3'
+    testImplementation 'org.apache.logging.log4j:log4j-core:2.11.1'
+    implementation 'io.netty:netty-all:4.1.65.Final'
+    implementation 'org.javassist:javassist:3.24.0-GA'
+    implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
+    implementation "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}"
+    implementation 'org.apache.logging.log4j:log4j-api:2.11.1'
 
 }
 
@@ -56,12 +56,14 @@ task run (type: JavaExec, dependsOn: classes){
 }
 
 task generateGemJarRequiresFile {
+    configurations.implementation.canBeResolved = true
+
     doLast {
         File jars_file = file('lib/logstash-input-beats_jars.rb')
             jars_file.newWriter().withWriter { w ->
                 w << "# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.\n\n"
                     w << "require \'jar_dependencies\'\n"
-                    configurations.runtime.allDependencies.each {
+                    configurations.implementation.allDependencies.each {
                         w << "require_jar(\'${it.group}\', \'${it.name}\', \'${it.version}\')\n"
                     }
                 w << "require_jar(\'${project.group}\', \'${project.name}\', \'${project.version}\')\n"
@@ -72,8 +74,8 @@ task generateGemJarRequiresFile {
 task vendor {
     doLast {
         String vendorPathPrefix = "vendor/jar-dependencies"
-            configurations.runtime.allDependencies.each { dep ->
-                File f = configurations.runtime.filter { it.absolutePath.contains("${dep.group}/${dep.name}/${dep.version}") }.singleFile
+            configurations.implementation.allDependencies.each { dep ->
+                File f = configurations.implementation.filter { it.absolutePath.contains("${dep.group}/${dep.name}/${dep.version}") }.singleFile
                     String groupPath = dep.group.replaceAll('\\.', '/')
                     File newJarFile = file("${vendorPathPrefix}/${groupPath}/${dep.name}/${dep.version}/${dep.name}-${dep.version}.jar")
                     newJarFile.mkdirs()

gradle/wrapper/gradle-wrapper.properties

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