diff --git a/build.gradle b/build.gradle
index 16649b5..0921dd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,217 +1,42 @@
-
 plugins {
-    id "org.sonarqube" version "2.8"
-    id "io.codearte.nexus-staging" version "0.21.0"
-    id "com.github.spotbugs" version "2.0.1"
-    id "org.xbib.gradle.plugin.asciidoctor" version "1.6.0.1"
+    id "de.marcphilipp.nexus-publish" version "0.4.0"
+    id "io.codearte.nexus-staging" version "0.21.1"
 }
 
-if (JavaVersion.current() < JavaVersion.VERSION_11) {
-    throw new GradleException("This build must be run with Java/OpenJDK 11+")
+wrapper {
+    gradleVersion = "${project.property('gradle.wrapper.version')}"
+    distributionType = Wrapper.DistributionType.ALL
 }
 
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'com.github.spotbugs'
-    apply plugin: 'pmd'
-    apply plugin: 'checkstyle'
-    apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
+ext {
+    user = 'jprante'
+    name = 'elx'
+    description = 'Admin/Bulk/Search API extensions for Elasticsearch clients (node, transport, http)'
+    inceptionYear = '2019'
+    url = 'https://github.com/' + user + '/' + name
+    scmUrl = 'https://github.com/' + user + '/' + name
+    scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
+    scmDeveloperConnection = 'scm:git:ssh://git@github.com:' + user + '/' + name + '.git'
+    issueManagementSystem = 'Github'
+    issueManagementUrl = ext.scmUrl + '/issues'
+    licenseName = 'The Apache License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+}
 
-    configurations {
-        asciidoclet
-    }
+
+subprojects {
+    apply plugin: 'java-library'
 
     dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter-api:${project.property('junit.version')}"
         testImplementation "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}"
         testImplementation "org.apache.logging.log4j:log4j-jul:${project.property('log4j.version')}"
         testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${project.property('log4j.version')}"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.property('junit.version')}"
-        asciidoclet "org.xbib:asciidoclet:${project.property('asciidoclet.version')}"
-    }
-
-    compileJava {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    compileTestJava {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:all"
-        if (!options.compilerArgs.contains("-processor")) {
-            options.compilerArgs << '-proc:none'
-        }
-    }
-
-    test {
-        enabled = true
-        useJUnitPlatform()
-        // for Lucene to access jdk.internal.ref and jdk.internal.misc in Java 11+
-        jvmArgs = [
-                '--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED',
-                '--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
-                '--add-opens=java.base/java.nio=ALL-UNNAMED'
-        ]
-        systemProperty 'java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager'
-        systemProperty 'jna.debug_load', 'true'
-        systemProperty 'path.home', "${project.buildDir}/"
-        failFast = true
-        testLogging {
-            events 'PASSED', 'FAILED', 'SKIPPED'
-        }
-        afterSuite { desc, result ->
-            if (!desc.parent) {
-                println "\nTest result: ${result.resultType}"
-                println "Test summary: ${result.testCount} tests, " +
-                        "${result.successfulTestCount} succeeded, " +
-                        "${result.failedTestCount} failed, " +
-                        "${result.skippedTestCount} skipped"
-            }
-        }
-    }
-    
-    clean {
-        delete "out"
-    }
-    
-    /*javadoc {
-        options.docletpath = configurations.asciidoclet.files.asType(List)
-        options.doclet = 'org.xbib.asciidoclet.Asciidoclet'
-        options.overview = "src/docs/asciidoclet/overview.adoc"
-        options.addStringOption "-base-dir", "${projectDir}"
-        options.addStringOption "-attribute",
-                "name=${project.name},version=${project.version},title-link=https://github.com/jprante/${project.name}"
-        configure(options) {
-            noTimestamp = true
-        }
-    }*/
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        archiveClassifier.set('javadoc')
-    }
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        from sourceSets.main.allSource
-        archiveClassifier.set('sources')
-    }
-
-    artifacts {
-        archives javadocJar, sourcesJar
-    }
-
-    spotbugs {
-        effort = "max"
-        reportLevel = "low"
-        //includeFilter = file("findbugs-exclude.xml")
-    }
-
-    tasks.withType(com.github.spotbugs.SpotBugsTask) {
-        ignoreFailures = true
-        reports {
-            xml.enabled = false
-            html.enabled = true
-        }
-    }
-
-    tasks.withType(Pmd) {
-        ignoreFailures = true
-        reports {
-            xml.enabled = true
-            html.enabled = true
-        }
-    }
-    tasks.withType(Checkstyle) {
-        ignoreFailures = true
-        reports {
-            xml.enabled = true
-            html.enabled = true
-        }
-    }
-
-    pmd {
-        toolVersion = '6.11.0'
-        ruleSets = ['category/java/bestpractices.xml']
     }
 
-    checkstyle {
-        configFile = rootProject.file('config/checkstyle/checkstyle.xml')
-        ignoreFailures = true
-        showViolations = true
-    }
-
-    sonarqube {
-        properties {
-            property "sonar.projectName", "${project.group} ${project.name}"
-            property "sonar.sourceEncoding", "UTF-8"
-            property "sonar.tests", "src/test/java"
-            property "sonar.scm.provider", "git"
-            property "sonar.junit.reportsPath", "build/test-results/test/"
-        }
-    }
-    ext {
-        description = 'Extensions for Elasticsearch clients (node and transport)'
-        scmUrl = 'https://github.com/jprante/elx'
-        scmConnection = 'scm:git:git://github.com/jprante/elx.git'
-        scmDeveloperConnection = 'scm:git:git://github.com/jprante/elx.git'
-    }
-
-    task sonaTypeUpload(type: Upload, dependsOn: build) {
-        group = 'publish'
-        configuration = configurations.archives
-        uploadDescriptor = true
-        repositories {
-            if (project.hasProperty('ossrhUsername')) {
-                mavenDeployer {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                    repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2') {
-                        authentication(userName: ossrhUsername, password: ossrhPassword)
-                    }
-                    snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots') {
-                        authentication(userName: ossrhUsername, password: ossrhPassword)
-                    }
-                    pom.project {
-                        groupId project.group
-                        artifactId project.name
-                        version project.version
-                        name project.name
-                        description description
-                        packaging 'jar'
-                        inceptionYear '2019'
-                        url scmUrl
-                        organization {
-                            name 'xbib'
-                            url 'http://xbib.org'
-                        }
-                        developers {
-                            developer {
-                                id 'xbib'
-                                name 'Jörg Prante'
-                                email 'joergprante@gmail.com'
-                                url 'https://github.com/jprante'
-                            }
-                        }
-                        scm {
-                            url scmUrl
-                            connection scmConnection
-                            developerConnection scmDeveloperConnection
-                        }
-                        licenses {
-                            license {
-                                name 'The Apache License, Version 2.0'
-                                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    nexusStaging {
-        packageGroup = "org.xbib"
-    }
+    apply from: rootProject.file('gradle/ide/idea.gradle')
+    apply from: rootProject.file('gradle/compile/java.gradle')
+    apply from: rootProject.file('gradle/test/junit5.gradle')
+    apply from: rootProject.file('gradle/publishing/publication.gradle')
 }
+
+apply from: rootProject.file('gradle/publishing/sonatype.gradle')
diff --git a/elx-api/build.gradle b/elx-api/build.gradle
index 81fc153..83a9f1b 100644
--- a/elx-api/build.gradle
+++ b/elx-api/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    compile "org.xbib:metrics-common:${project.property('xbib-metrics.version')}"
-    compile "org.elasticsearch:elasticsearch:${rootProject.property('elasticsearch.version')}"
-}
\ No newline at end of file
+    api "org.xbib:metrics-common:${project.property('xbib-metrics.version')}"
+    api "org.elasticsearch:elasticsearch:${rootProject.property('elasticsearch.version')}"
+}
diff --git a/elx-common/build.gradle b/elx-common/build.gradle
index 4238e95..b79e852 100644
--- a/elx-common/build.gradle
+++ b/elx-common/build.gradle
@@ -1,6 +1,6 @@
 dependencies{
-    compile project(':elx-api')
-    testCompile "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
-    testCompile "io.netty:netty-codec-http:${project.property('netty.version')}"
-    testCompile "io.netty:netty-transport:${project.property('netty.version')}"
+    api project(':elx-api')
+    testImplementation "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
+    testImplementation "io.netty:netty-codec-http:${project.property('netty.version')}"
+    testImplementation "io.netty:netty-transport:${project.property('netty.version')}"
 }
diff --git a/elx-http/build.gradle b/elx-http/build.gradle
index 05d5d69..36da0d6 100644
--- a/elx-http/build.gradle
+++ b/elx-http/build.gradle
@@ -1,13 +1,13 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 dependencies{
-    compile project(':elx-common')
-    compile "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
-    compile "org.xbib:netty-http-client:${project.property('xbib-netty-http.version')}"
-    runtime "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}"
+    api project(':elx-common')
+    api "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
+    api "org.xbib:netty-http-client:${project.property('xbib-netty-http.version')}"
+    runtimeOnly "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}"
     if (Os.isFamily(Os.FAMILY_MAC)) {
-        runtime "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative-legacy-macosx.version')}"
+        runtimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative-legacy-macosx.version')}"
     } else if (Os.isFamily(Os.FAMILY_UNIX)) {
-        runtime "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
+        runtimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
     }
 }
diff --git a/elx-node/build.gradle b/elx-node/build.gradle
index 6d92165..6ce98b7 100644
--- a/elx-node/build.gradle
+++ b/elx-node/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    compile project(':elx-common')
-    compile "org.elasticsearch.plugin:transport-netty4-client:${project.property('elasticsearch.version')}"
-    compile "io.netty:netty-codec-http:${project.property('netty.version')}"
-    compile "io.netty:netty-transport:${project.property('netty.version')}"
+    api project(':elx-common')
+    api "org.elasticsearch.plugin:transport-netty4-client:${project.property('elasticsearch.version')}"
+    api "io.netty:netty-codec-http:${project.property('netty.version')}"
+    api "io.netty:netty-transport:${project.property('netty.version')}"
 }
diff --git a/elx-transport/build.gradle b/elx-transport/build.gradle
index fa59fd8..a8313e6 100644
--- a/elx-transport/build.gradle
+++ b/elx-transport/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    compile project(':elx-common')
-    compile "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
-    compile "io.netty:netty-codec-http:${project.property('netty.version')}"
-    compile "io.netty:netty-transport:${project.property('netty.version')}"
+    api project(':elx-common')
+    api "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
+    api "io.netty:netty-codec-http:${project.property('netty.version')}"
+    api "io.netty:netty-transport:${project.property('netty.version')}"
 }
diff --git a/gradle.properties b/gradle.properties
index 89f8883..b91c9ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,15 +2,12 @@ group = org.xbib
 name = elx
 version = 7.6.1.1
 
+gradle.wrapper.version = 6.4.1
 elasticsearch.version = 7.6.1
 netty.version = 4.1.49.Final
-xbib-netty-http.version = 4.1.49.0
+xbib-netty-http.version = 4.1.49.1
 tcnative.version = 2.0.29.Final
 tcnative-legacy-macosx.version = 2.0.26.Final
 bouncycastle.version = 1.64
-xbib-metrics.version = 2.0.0
-
-# test
+xbib-metrics.version = 2.1.0
 log4j.version = 2.13.1
-junit.version = 5.6.2
-asciidoclet.version = 1.6.0.0
diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle
new file mode 100644
index 0000000..a9d76ce
--- /dev/null
+++ b/gradle/compile/java.gradle
@@ -0,0 +1,35 @@
+
+apply plugin: 'java-library'
+
+java {
+    modularity.inferModulePath.set(true)
+}
+
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+compileTestJava {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+jar {
+    manifest {
+        attributes('Implementation-Version': project.version)
+    }
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier 'javadoc'
+}
+
+artifacts {
+    archives sourcesJar, javadocJar
+}
\ No newline at end of file
diff --git a/gradle/documentation/asciidoc.gradle b/gradle/documentation/asciidoc.gradle
new file mode 100644
index 0000000..87ba22e
--- /dev/null
+++ b/gradle/documentation/asciidoc.gradle
@@ -0,0 +1,55 @@
+apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
+
+configurations {
+    asciidoclet
+}
+
+dependencies {
+    asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
+}
+
+
+asciidoctor {
+    backends 'html5'
+    outputDir = file("${rootProject.projectDir}/docs")
+    separateOutputDirs = false
+    attributes 'source-highlighter': 'coderay',
+            idprefix: '',
+            idseparator: '-',
+            toc: 'left',
+            doctype: 'book',
+            icons: 'font',
+            encoding: 'utf-8',
+            sectlink: true,
+            sectanchors: true,
+            linkattrs: true,
+            imagesdir: 'img',
+            stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
+}
+
+
+/*javadoc {
+options.docletpath = configurations.asciidoclet.files.asType(List)
+options.doclet = 'org.asciidoctor.Asciidoclet'
+//options.overview = "src/docs/asciidoclet/overview.adoc"
+options.addStringOption "-base-dir", "${projectDir}"
+options.addStringOption "-attribute",
+        "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
+configure(options) {
+    noTimestamp = true
+}
+}*/
+
+
+/*javadoc {
+    options.docletpath = configurations.asciidoclet.files.asType(List)
+    options.doclet = 'org.asciidoctor.Asciidoclet'
+    options.overview = "${rootProject.projectDir}/src/docs/asciidoclet/overview.adoc"
+    options.addStringOption "-base-dir", "${projectDir}"
+    options.addStringOption "-attribute",
+            "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
+    options.destinationDirectory(file("${projectDir}/docs/javadoc"))
+    configure(options) {
+        noTimestamp = true
+    }
+}*/
diff --git a/gradle/ide/idea.gradle b/gradle/ide/idea.gradle
new file mode 100644
index 0000000..64e2167
--- /dev/null
+++ b/gradle/ide/idea.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'idea'
+
+idea {
+    module {
+        outputDir file('build/classes/java/main')
+        testOutputDir file('build/classes/java/test')
+    }
+}
+
+if (project.convention.findPlugin(JavaPluginConvention)) {
+    //sourceSets.main.output.classesDirs = file("build/classes/java/main")
+    //sourceSets.test.output.classesDirs = file("build/classes/java/test")
+}
diff --git a/gradle/publishing/publication.gradle b/gradle/publishing/publication.gradle
new file mode 100644
index 0000000..c35fcb9
--- /dev/null
+++ b/gradle/publishing/publication.gradle
@@ -0,0 +1,64 @@
+
+apply plugin: "de.marcphilipp.nexus-publish"
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+            pom {
+                name = project.name
+                description = rootProject.ext.description
+                url = rootProject.ext.url
+                inceptionYear = rootProject.ext.inceptionYear
+                packaging = 'jar'
+                organization {
+                    name = 'xbib'
+                    url = 'https://xbib.org'
+                }
+                developers {
+                    developer {
+                        id = 'jprante'
+                        name = 'Jörg Prante'
+                        email = 'joergprante@gmail.com'
+                        url = 'https://github.com/jprante'
+                    }
+                }
+                scm {
+                    url = rootProject.ext.scmUrl
+                    connection = rootProject.ext.scmConnection
+                    developerConnection = rootProject.ext.scmDeveloperConnection
+                }
+                issueManagement {
+                    system = rootProject.ext.issueManagementSystem
+                    url = rootProject.ext.issueManagementUrl
+                }
+                licenses {
+                    license {
+                        name = rootProject.ext.licenseName
+                        url = rootProject.ext.licenseUrl
+                        distribution = 'repo'
+                    }
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("signing.keyId")) {
+    apply plugin: 'signing'
+    signing {
+        sign publishing.publications.mavenJava
+    }
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username = project.property('ossrhUsername')
+            password = project.property('ossrhPassword')
+            packageGroup = "org.xbib"
+        }
+    }
+}
diff --git a/gradle/publishing/sonatype.gradle b/gradle/publishing/sonatype.gradle
new file mode 100644
index 0000000..e1813f3
--- /dev/null
+++ b/gradle/publishing/sonatype.gradle
@@ -0,0 +1,11 @@
+
+if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+
+    apply plugin: 'io.codearte.nexus-staging'
+
+    nexusStaging {
+        username = project.property('ossrhUsername')
+        password = project.property('ossrhPassword')
+        packageGroup = "org.xbib"
+    }
+}
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
new file mode 100644
index 0000000..9654bab
--- /dev/null
+++ b/gradle/test/junit5.gradle
@@ -0,0 +1,36 @@
+
+def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
+def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
+
+dependencies {
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+}
+
+test {
+    useJUnitPlatform()
+    // for Lucene to access jdk.internal.ref and jdk.internal.misc in Java 11+
+    jvmArgs = [
+            '--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED',
+            '--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
+            '--add-opens=java.base/java.nio=ALL-UNNAMED'
+    ]
+    systemProperty 'java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager'
+    systemProperty 'jna.debug_load', 'true'
+    systemProperty 'path.home', "${project.buildDir}/"
+    failFast = true
+    testLogging {
+        events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED'
+    }
+    afterSuite { desc, result ->
+        if (!desc.parent) {
+            println "\nTest result: ${result.resultType}"
+            println "Test summary: ${result.testCount} tests, " +
+                    "${result.successfulTestCount} succeeded, " +
+                    "${result.failedTestCount} failed, " +
+                    "${result.skippedTestCount} skipped"
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..62d4c05 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 938abf0..21e622d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Apr 01 22:38:01 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acf..fbd7c51 100755
--- a/gradlew
+++ b/gradlew
@@ -82,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
@@ -129,6 +130,7 @@ fi
 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
@@ -154,19 +156,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 +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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a1..a9f778a 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ 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="-Xmx64m" "-Xms64m"
 
@@ -81,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%