Merge remote-tracking branch 'origin/1.x'

Jenkinsfile

@@ -445,7 +445,7 @@ if (!binding.hasVariable('quietPeriod')) {
   binding.setVariable('quietPeriod', 10 + buildPriority * 2)
 }
 if (!binding.hasVariable('nice')) {
-  def nice = (params.BuildPriority as Integer) - 1;
+  def nice = (params.BuildPriority == null) ? 0 : ((params.BuildPriority as Integer) - 1);
   if (nice < 0) nice = 0;
   else if (nice > 19) nice = 19;
   binding.setVariable('nice', nice)
@@ -478,7 +478,7 @@ if (!binding.hasVariable('failureEmailTo')) {
 }
 
 // Common settings
-def mvnCommon   = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
+def mvnCommon   = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild == null ? false : params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
 def buildPhases = 'clean process-test-classes'
 
 // Determine nice command prefix or empty string for none
@@ -628,7 +628,7 @@ or any build that adds or removes build artifacts."""
     stage('Check Ready') {
       when {
         expression {
-          return params.abortOnUnreadyDependency
+          return (params.abortOnUnreadyDependency == null) ? true : params.abortOnUnreadyDependency
         }
       }
       steps {
@@ -965,7 +965,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
       filter: '**/*.pom, **/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
-      optional: !params.requireLastBuild
+      optional: (params.requireLastBuild == null) ? true : !params.requireLastBuild
     )
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
     sh moveSurefireReportsScript()

book/Jenkinsfile

@@ -449,7 +449,7 @@ if (!binding.hasVariable('quietPeriod')) {
   binding.setVariable('quietPeriod', 10 + buildPriority * 2)
 }
 if (!binding.hasVariable('nice')) {
-  def nice = (params.BuildPriority as Integer) - 1;
+  def nice = (params.BuildPriority == null) ? 0 : ((params.BuildPriority as Integer) - 1);
   if (nice < 0) nice = 0;
   else if (nice > 19) nice = 19;
   binding.setVariable('nice', nice)
@@ -482,7 +482,7 @@ if (!binding.hasVariable('failureEmailTo')) {
 }
 
 // Common settings
-def mvnCommon   = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
+def mvnCommon   = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild == null ? false : params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
 def buildPhases = 'clean process-test-classes'
 
 // Determine nice command prefix or empty string for none
@@ -632,7 +632,7 @@ or any build that adds or removes build artifacts."""
     stage('Check Ready') {
       when {
         expression {
-          return params.abortOnUnreadyDependency
+          return (params.abortOnUnreadyDependency == null) ? true : params.abortOnUnreadyDependency
         }
       }
       steps {
@@ -969,7 +969,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
       filter: '**/*.pom, **/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
-      optional: !params.requireLastBuild
+      optional: (params.requireLastBuild == null) ? true : !params.requireLastBuild
     )
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
     sh moveSurefireReportsScript()