diff --git a/build.gradle b/build.gradle
index be5fd62..59d932b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.plugins.ide.eclipse.model.AccessRule
 
-apply plugin: 'java'
+//apply plugin: 'java'
 apply plugin: 'eclipse'
 
 
@@ -13,14 +13,14 @@ buildscript {
 
   dependencies {
   	// usage: gradlew dependencyUpdates -Drevision=release
-    classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
+    classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
   }
 }
 
 ext {
     
     version_log4j2= '2.12.1'
-    version_spring = '2.1.9.RELEASE'
+    version_spring = '2.2.0.RELEASE'
     
     lib_antlr = "org.antlr:antlr4:4.7.2"
     
@@ -57,6 +57,8 @@ ext {
 subprojects {
 	apply plugin: 'java'
 	apply plugin: 'eclipse'
+	
+	compileJava.options.encoding = 'UTF-8'
 
 	// java compatibility version
 	sourceCompatibility = 12
@@ -88,6 +90,16 @@ subprojects {
 		testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
 	}
 	
+   task eclipseSettings(type: Copy) {
+      from ("${rootProject.projectDir}/eclipse/") {
+          include '**/*.prefs'
+          //filter(ReplaceTokens, tokens: [rootProjectDir: "${rootProject.projectDir}".toString().replaceAll('\\\\', '/')])
+      }
+      into "${project.projectDir}/.settings/"
+  }
+  tasks.eclipseJdt.dependsOn eclipseSettings
+  tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings
+	
 	eclipse {
         classpath {
             file {
@@ -104,20 +116,6 @@ subprojects {
     }
 }
 
-allprojects {
- 	compileJava.options.encoding = 'UTF-8'
- 	
- 	task eclipseSettings(type: Copy) {
-        from ("${rootProject.projectDir}/eclipse/") {
-            include '**/*.prefs'
-            //filter(ReplaceTokens, tokens: [rootProjectDir: "${rootProject.projectDir}".toString().replaceAll('\\\\', '/')])
-        }
-        into "${project.projectDir}/.settings/"
-    }
-	tasks.eclipseJdt.dependsOn eclipseSettings
-    tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings
-}
-
 wrapper {
-    gradleVersion = '5.6.2'
+    gradleVersion = '6.0-rc-1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..cc4fdc2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7c4388a..041a7bf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acf..2fe81a7 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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
 
@@ -175,14 +175,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" "$@"