From 00126b8901372d4f3b96950d93a677545f2775b9 Mon Sep 17 00:00:00 2001
From: "AO Industries, Inc" <support@aoindustries.com>
Date: Mon, 23 Oct 2023 21:45:09 +0000
Subject: [PATCH] Allow null params on first build

---
 Jenkinsfile      | 8 ++++----
 book/Jenkinsfile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e0e1ffe..4f29bf8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -434,7 +434,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)
@@ -467,7 +467,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
@@ -617,7 +617,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 {
@@ -954,7 +954,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()
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
index e3a9754..a497c08 100644
--- a/book/Jenkinsfile
+++ b/book/Jenkinsfile
@@ -436,7 +436,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)
@@ -469,7 +469,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
@@ -619,7 +619,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 {
@@ -956,7 +956,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()