Merge pull request #1073 from daspilker/gradle-3.5

Updated Gradle and Gradle JPI plugin

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 02 17:27:43 CET 2016
+#Sun Oct 08 01:34:35 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip

gradlew

@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+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

job-dsl-plugin/build.gradle

@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id 'org.jenkins-ci.jpi' version '0.22.0'
+    id 'org.jenkins-ci.jpi' version '0.23.1'
 }
 
 description = 'Jenkins plugin to leverage job-dsl-core to programmatic create jobs from inside Jenkins.'
@@ -89,18 +89,16 @@ dependencies {
     compile(project(':job-dsl-core'))  {
         exclude group: 'org.jvnet.hudson', module:'xstream'
     }
-    jenkinsPlugins 'org.jenkins-ci.plugins:structs:1.6@jar'
-    jenkinsPlugins 'org.jenkins-ci.plugins:script-security:1.25@jar'
-    optionalJenkinsPlugins 'org.jenkins-ci.plugins:vsphere-cloud:1.1.11@jar'
-    optionalJenkinsPlugins 'org.jenkins-ci.plugins:config-file-provider:2.15.4@jar'
-    optionalJenkinsPlugins 'org.jenkinsci.plugins:managed-scripts:1.3@jar'
-    jenkinsTest 'org.jenkins-ci.plugins:cloudbees-folder:5.12@jar'
-    jenkinsTest 'org.jenkins-ci.plugins:matrix-auth:1.3@jar'
-    jenkinsTest 'org.jenkins-ci.plugins:nested-view:1.14@jar'
-    jenkinsTest 'org.jenkins-ci.plugins:credentials:2.1.10@jar'
-    jenkinsTest 'org.jenkins-ci.main:jenkins-test-harness:2.22@jar'
-    jenkinsTest 'org.jenkins-ci.ui:jquery-detached:1.2.1:core-assets'
-    testCompile('org.kohsuke:groovy-sandbox:1.10') { // workaround for JENKINS-35412
-        exclude group: 'org.codehaus.groovy'
+    jenkinsPlugins 'org.jenkins-ci.plugins:structs:1.6'
+    jenkinsPlugins 'org.jenkins-ci.plugins:script-security:1.25'
+    optionalJenkinsPlugins('org.jenkins-ci.plugins:vsphere-cloud:1.1.11') {
+        exclude group: 'dom4j'
     }
+    optionalJenkinsPlugins 'org.jenkins-ci.plugins:config-file-provider:2.15.4'
+    optionalJenkinsPlugins 'org.jenkinsci.plugins:managed-scripts:1.3'
+    jenkinsTest 'org.jenkins-ci.plugins:cloudbees-folder:5.12'
+    jenkinsTest 'org.jenkins-ci.plugins:matrix-auth:1.3'
+    jenkinsTest 'org.jenkins-ci.plugins:nested-view:1.14'
+    jenkinsTest 'org.jenkins-ci.plugins:credentials:2.1.10'
+    jenkinsTest 'org.jenkins-ci.main:jenkins-test-harness:2.22'
 }