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

ao-apps · Sep 10, 2023 · 43c60d9 · 43c60d9
2 parents 58f0571 + 8cc0a07
commit 43c60d9
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -41,7 +41,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']                                    *
@@ -138,7 +138,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/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -56,7 +56,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']                                    *
@@ -153,7 +153,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/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view