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

ao-apps · Sep 10, 2023 · 0eb55f6 · 0eb55f6
2 parents 84f5520 + 3afa8b1
commit 0eb55f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -64,7 +64,7 @@ def upstreamProjects = [
  * Variables that may be defined above this block:                                        *
  *                                                                                        *
  * deployJdk            The version of JDK that will be used for the deploy stage.        *
- *                      Defaults to '17'                                                  *
+ *                      Defaults to '20'                                                  *
  *                                                                                        *
  * buildJdks            The array of JDK versions that will build.                        *
  *                      Defaults to ['11', '17', '20']                                    *
@@ -161,7 +161,7 @@ def upstreamProjects = [
 
 // JDK versions
 if (!binding.hasVariable('deployJdk')) {
-  binding.setVariable('deployJdk', '17')
+  binding.setVariable('deployJdk', '20')
 }
 if (!binding.hasVariable('buildJdks')) {
   binding.setVariable(

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -67,7 +67,7 @@ def upstreamProjects = [
  * Variables that may be defined above this block:                                        *
  *                                                                                        *
  * deployJdk            The version of JDK that will be used for the deploy stage.        *
- *                      Defaults to '17'                                                  *
+ *                      Defaults to '20'                                                  *
  *                                                                                        *
  * buildJdks            The array of JDK versions that will build.                        *
  *                      Defaults to ['11', '17', '20']                                    *
@@ -164,7 +164,7 @@ def upstreamProjects = [
 
 // JDK versions
 if (!binding.hasVariable('deployJdk')) {
-  binding.setVariable('deployJdk', '17')
+  binding.setVariable('deployJdk', '20')
 }
 if (!binding.hasVariable('buildJdks')) {
   binding.setVariable(