Build tweaks and Gradle update

Update Gradle wrapper to latest version (4.0).
Apply Java plugin (and other properties) to just the subprojects.
Use constants for Java version.
Execute uberJar task automatically when building and update the README
to reflect the change.
Allow to generate the POM file and install it to local Maven repository.

Author: thc202

README.md

@@ -105,7 +105,7 @@ Checkout the tagged version:
 
 Create the artifacts/libraries necessary for the release:
 
-    ./gradlew clean build uberJar
+    ./gradlew clean build
 
 ### Release to Maven Central
 

build.gradle

@@ -1,12 +1,12 @@
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.2.1'
+    gradleVersion = '4.0'
 }
 
 apply from: "gradle/compile.gradle"
 apply from: "gradle/idea.gradle"
 apply from: "gradle/eclipse.gradle"
 
-allprojects {
+subprojects {
     apply plugin: 'java'
     group = 'org.zaproxy'
 
@@ -18,6 +18,6 @@ allprojects {
         mavenCentral()
     }
 
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
 }

gradle/wrapper/gradle-wrapper.jar

@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
-distributionSha256Sum=9843a3654d3e57dce54db06d05f18b664b95c22bf90c6becccb61fc63ce60689
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionSha256Sum=56bd2dde29ba2a93903c557da1745cafd72cdd8b6b0b83c05a40ed7896b79dfe

gradle/wrapper/gradle-wrapper.properties

@@ -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,16 +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 "$@")
+
+# 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
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -53,6 +53,8 @@ task uberJar(type: Jar) {
     with jar
 }
 
+build.dependsOn 'uberJar'
+
 artifacts { archives sourcesJar, javadocJar }
 
 signing {
@@ -61,6 +63,66 @@ signing {
     }
 }
 
+ext.pomData = pom {
+    project {
+        name 'OWASP ZAP API Client'
+        packaging 'jar'
+        description 'Java implementation to access OWASP ZAP API.'
+        url 'https://github.com/zaproxy/zap-api-java'
+
+        organization {
+            name 'OWASP'
+            url 'https://www.owasp.org/index.php/ZAP'
+        }
+
+        mailingLists {
+            mailingList {
+                name 'OWASP ZAP User Group'
+                post '[email protected]'
+                archive 'https://groups.google.com/group/zaproxy-users'
+            }
+            mailingList {
+                name 'OWASP ZAP Developer Group'
+                post '[email protected]'
+                archive 'https://groups.google.com/group/zaproxy-develop'
+            }
+        }
+
+        scm {
+            url 'https://github.com/zaproxy/zap-api-java'
+            connection 'scm:git:https://github.com/zaproxy/zap-api-java.git'
+            developerConnection 'scm:git:https://github.com/zaproxy/zap-api-java.git'
+        }
+
+        licenses {
+            license {
+                name 'The Apache License, Version 2.0'
+                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                distribution 'repo'
+            }
+        }
+
+        developers {
+            developer {
+                id 'psiinon'
+                name 'Simon Bennetts'
+                email '[email protected]'
+            }
+        }
+    }
+}
+
+task generatePom {
+    description 'Generates the POM file.'
+    pomData.writeTo("$buildDir/pom.xml")
+}
+
+install {
+    repositories.mavenInstaller {
+        pom = pomData
+    }
+}
+
 uploadArchives {
     repositories {
         mavenDeployer {
@@ -80,54 +142,7 @@ uploadArchives {
                 }
             }
 
-            pom {
-                project {
-                    name 'OWASP ZAP API Client'
-                    packaging 'jar'
-                    description 'Java implementation to access OWASP ZAP API.'
-                    url 'https://github.com/zaproxy/zap-api-java'
-
-                    organization {
-                        name 'OWASP'
-                        url 'https://www.owasp.org/index.php/ZAP'
-                    }
-
-                    mailingLists {
-                        mailingList {
-                            name 'OWASP ZAP User Group'
-                            post '[email protected]'
-                            archive 'https://groups.google.com/group/zaproxy-users'
-                        }
-                        mailingList {
-                            name 'OWASP ZAP Developer Group'
-                            post '[email protected]'
-                            archive 'https://groups.google.com/group/zaproxy-develop'
-                        }
-                    }
-
-                    scm {
-                        url 'https://github.com/zaproxy/zap-api-java'
-                        connection 'scm:git:https://github.com/zaproxy/zap-api-java.git'
-                        developerConnection 'scm:git:https://github.com/zaproxy/zap-api-java.git'
-                    }
-
-                    licenses {
-                        license {
-                            name 'The Apache License, Version 2.0'
-                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                            distribution 'repo'
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id 'psiinon'
-                            name 'Simon Bennetts'
-                            email '[email protected]'
-                        }
-                    }
-                }
-            }
+            pom = pomData
         }
     }
 }