new gradle version

build.gradle

@@ -1,7 +1,10 @@
 import groovy.xml.QName
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+import java.nio.charset.StandardCharsets
+
+wrapper {
+    gradleVersion = '4.6'
+    distributionType = org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
 }
 
 ext {
@@ -57,10 +60,10 @@ configure(subprojects.findAll {
 
     apply plugin: 'java'
     apply plugin: 'osgi'
-    compileJava.options.encoding = 'utf-8'
+    compileJava.options.encoding = StandardCharsets.UTF_8
     compileJava.sourceCompatibility = JavaVersion.VERSION_1_8
     compileJava.targetCompatibility = JavaVersion.VERSION_1_8
-    compileTestJava.options.encoding = 'utf-8'
+    compileTestJava.options.encoding = StandardCharsets.UTF_8
     compileTestJava.sourceCompatibility = JavaVersion.VERSION_1_8
     compileTestJava.targetCompatibility = JavaVersion.VERSION_1_8
 
@@ -159,7 +162,7 @@ configure(subprojects.findAll {
     }
 
     javadoc {
-        options.encoding = "UTF-8"
+        options.encoding = StandardCharsets.UTF_8
     }
 
     if (project.hasProperty('secretKeyRingFileSourceURL')) {
@@ -363,7 +366,7 @@ project(':projects:copper-spring') {
 project(':projects:copper-coreengine') {
     dependencies {
         compile project(':projects:copper-jmx-interface')
-        
+
         // asm
         compile "org.ow2.asm:asm:$asmVersion"
         compile "org.ow2.asm:asm-commons:$asmVersion"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Nov 23 12:06:08 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line