Update gradle dependencies to 6.5 (#7)

Later versions of Logstash require gradle 6.5 to build Java plugins Use task avoidance API Replace use of deprecated 'compile' and 'testCompile' configuration dependencies Replace use of deprecated 'classifier' with shadowJar plugin

Author: robbavey

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.1
+- Fix gradle incompatibility issue with Logstash 7.9 and above.
+
 ## 1.0.0
 - Updated for GA release of native support for Java plugins. Includes:
  - Improved Gradle task wrappers

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

build.gradle

@@ -30,35 +30,31 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
+ classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
  }
 }
 
 repositories {
  mavenCentral()
 }
 
-task wrapper(type: Wrapper) {
- gradleVersion = '4.0'
-}
-
 apply plugin: 'com.github.johnrengelman.shadow'
 
 shadowJar {
- classifier = null
+ archiveClassifier = null
 }
 
 dependencies {
- compile 'org.apache.logging.log4j:log4j-api:2.9.1'
- compile 'org.apache.logging.log4j:log4j-core:2.9.1'
- compile "com.fasterxml.jackson.core:jackson-core:2.9.5"
- compile "com.fasterxml.jackson.core:jackson-databind:2.9.5"
- compile "com.fasterxml.jackson.core:jackson-annotations:2.9.5"
- compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5"
- compile fileTree(dir: LOGSTASH_CORE_PATH, include: "**/logstash-core-?.?.?.jar")
-
- testCompile 'junit:junit:4.12'
- testCompile 'org.jruby:jruby-complete:9.1.13.0'
+ implementation 'org.apache.logging.log4j:log4j-api:2.9.1'
+ implementation 'org.apache.logging.log4j:log4j-core:2.9.1'
+ implementation "com.fasterxml.jackson.core:jackson-core:2.9.5"
+ implementation "com.fasterxml.jackson.core:jackson-databind:2.9.5"
+ implementation "com.fasterxml.jackson.core:jackson-annotations:2.9.5"
+ implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5"
+ implementation fileTree(dir: LOGSTASH_CORE_PATH, include: "**/logstash-core-?.?.?.jar")
+
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'org.jruby:jruby-complete:9.1.13.0'
 }
 
 clean {
@@ -75,7 +71,8 @@ tasks.withType(JavaCompile) {
  options.encoding = 'UTF-8'
 }
 
-task vendor(dependsOn: shadowJar) {
+tasks.register("vendor"){
+ dependsOn shadowJar
  doLast {
  String vendorPathPrefix = "vendor/jar-dependencies"
  String projectGroupPath = project.group.replaceAll('\\.', '/')
@@ -86,13 +83,13 @@ task vendor(dependsOn: shadowJar) {
  }
 }
 
-task generateRubySupportFiles() {
+tasks.register("generateRubySupportFiles") {
  doLast {
  generateRubySupportFilesForPlugin(project.description, project.group, version)
  }
 }
 
-task removeObsoleteJars() {
+tasks.register("removeObsoleteJars") {
  doLast {
  new FileNameFinder().getFileNames(
  projectDir.toString(),
@@ -103,8 +100,9 @@ task removeObsoleteJars() {
  }
 }
 
-task gem(dependsOn: [downloadAndInstallJRuby, removeObsoleteJars, vendor, generateRubySupportFiles]) {
+tasks.register("gem"){
+ dependsOn [downloadAndInstallJRuby, removeObsoleteJars, vendor, generateRubySupportFiles]
  doLast {
  buildGem(projectDir, buildDir, pluginInfo.pluginFullName() + ".gemspec")
  }
-}
+}

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
  if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
  GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
  APP_HOME=`cygpath --path --mixed "$APP_HOME"`
  CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ 
  JAVACMD=`cygpath --unix "$JAVACMD"`
 
  # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
  else
  eval `echo args$i`="\"$arg\""
  fi
- i=$((i+1))
+ i=`expr $i + 1`
  done
  case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
  esac
 fi
 
@@ -159,14 +177,9 @@ save () {
  for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
  echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%