Dependency upgrades

gradle.properties

@@ -11,14 +11,14 @@ codenarcVersion=1.3
 credentialsPluginVersion=2.1.18
 folderPluginVersion=6.7
 gradlePluginVersion=1.22
-groovyPluginVersion=1.30
+workflowJobPluginVersion=2.3
 
 # Dependencies
 byteBuddyVersion=1.8.11
 httpBuilderVersion=0.7.2
-jenkinsTestHarnessVersion=2.48
-jenkinsVersion=2.169
-jobDslVersion=1.72
+jenkinsTestHarnessVersion=2.55
+jenkinsVersion=2.195
+jobDslVersion=1.76
 spockVersion=1.1-groovy-2.4
 versionNumberVersion=1.6
-xmlUnitVersion=2.6.2
+xmlUnitVersion=2.6.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -44,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -30,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

plugin/build.gradle

@@ -105,7 +105,7 @@ dependencies {
     jenkinsPlugins "org.jenkins-ci.plugins:cloudbees-folder:$folderPluginVersion"
     jenkinsPlugins "org.jenkins-ci.plugins:credentials:$credentialsPluginVersion"
     jenkinsPlugins "org.jenkins-ci.plugins:gradle:$gradlePluginVersion" // Old version used to test reporting of outdated plugins.
-    jenkinsPlugins "org.jenkins-ci.plugins:groovy:$groovyPluginVersion" // Old version used to test reporting of deprecated plugins.
+    jenkinsPlugins "org.jenkins-ci.plugins.workflow:workflow-job:$workflowJobPluginVersion" // Old version used to test reporting of deprecated plugins.
 }
 
 task resolveTestPlugins(type: Copy) {

plugin/src/functionalTest/groovy/com/here/gradle/plugins/jobdsl/tasks/UpdateJenkinsTest.groovy

@@ -41,7 +41,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy
 import org.jvnet.hudson.test.recipes.WithPlugin
 import org.xmlunit.builder.DiffBuilder
 import org.xmlunit.diff.Diff
-import spock.lang.Ignore
 
 /**
  * Test for the dslUpdateJenkins test. Uses {@link JenkinsRule} to create a Jenkins instance to run the tests against.
@@ -377,8 +376,13 @@ class UpdateJenkinsTest extends AbstractTaskTest {
         jenkinsRule.jenkins.getItemByFullName('job') instanceof FreeStyleProject
     }
 
-    @Ignore('Job DSL 1.72 has no deprecated plugins. Enable again when upgrading to a newer version.')
-    @WithPlugin('groovy-1.30.hpi')
+    @WithPlugin([
+            'script-security-1.16.hpi',
+            'workflow-api-2.1.hpi',
+            'workflow-step-api-1.15.hpi',
+            'workflow-support-2.1.hpi',
+            'workflow-job-2.3.hpi'
+    ])
     def 'deprecated plugins are reported'() {
         given:
         buildFile << readBuildGradle('updateJenkins/build.gradle')
@@ -389,7 +393,7 @@ class UpdateJenkinsTest extends AbstractTaskTest {
 
         then:
         result.task(':dslUpdateJenkins').outcome == TaskOutcome.SUCCESS
-        gradleSectionOutput(result.output, 'Deprecated plugins:') == ['groovy']
+        gradleSectionOutput(result.output, 'Deprecated plugins:') == ['workflow-job']
     }
 
     def 'missing plugins are reported'() {

plugin/src/functionalTest/resources/generateXml/folder.xml

@@ -6,14 +6,14 @@
         <views>
             <hudson.model.AllView>
                 <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-                <name>All</name>
+                <name>all</name>
                 <filterExecutors>false</filterExecutors>
                 <filterQueue>false</filterQueue>
                 <properties class="hudson.model.View$PropertyList"/>
             </hudson.model.AllView>
         </views>
         <tabBar class="hudson.views.DefaultViewsTabBar"/>
-        <primaryView>All</primaryView>
+        <primaryView>all</primaryView>
     </folderViews>
     <healthMetrics>
         <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric/>

plugin/src/functionalTest/resources/updateJenkins/deprecated-plugins.groovy

@@ -1,5 +1,2 @@
-job('deprecated-plugins') {
-    steps {
-        groovyCommand('println "Hello world!"')
-    }
+pipelineJob('deprecated-plugins') {
 }

plugin/src/functionalTest/resources/updateJenkins/folder-with-credentials.xml

@@ -25,14 +25,14 @@
     <views>
       <hudson.model.AllView>
         <owner reference="../../../.." class="com.cloudbees.hudson.plugins.folder.Folder"/>
-        <name>All</name>
+        <name>all</name>
         <filterExecutors>false</filterExecutors>
         <filterQueue>false</filterQueue>
         <properties class="hudson.model.View$PropertyList"/>
       </hudson.model.AllView>
     </views>
     <tabBar class="hudson.views.DefaultViewsTabBar"/>
-    <primaryView>All</primaryView>
+    <primaryView>all</primaryView>
   </folderViews>
   <healthMetrics>
     <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric/>

plugin/src/functionalTest/resources/updateJenkins/folder.xml

@@ -6,14 +6,14 @@
         <views>
             <hudson.model.AllView>
                 <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
-                <name>All</name>
+                <name>all</name>
                 <filterExecutors>false</filterExecutors>
                 <filterQueue>false</filterQueue>
                 <properties class="hudson.model.View$PropertyList"/>
             </hudson.model.AllView>
         </views>
         <tabBar class="hudson.views.DefaultViewsTabBar"/>
-        <primaryView>All</primaryView>
+        <primaryView>all</primaryView>
     </folderViews>
     <healthMetrics>
         <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric/>