Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ao-apps
ao-apps committed Jul 11, 2023
2 parents 5f710f2 + bebd4c5 commit b43aa94
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ def upstreamProjects = [
* Defaults to '17' *
* *
* buildJdks The array of JDK versions that will build. *
* Defaults to ['11', '17', '19'] *
* Defaults to ['11', '17', '20'] *
* Changes must be copied to matrix axes! *
* *
* testJdks The array of JDK versions that will test against every build JDK. *
* Defaults to ['11', '17', '19'] *
* Defaults to ['11', '17', '20'] *
* Changes must be copied to matrix axes! *
* *
* upstreamProjects The array of relative paths to upstream projects. *
Expand Down Expand Up @@ -172,13 +172,13 @@ if (!binding.hasVariable('deployJdk')) {
if (!binding.hasVariable('buildJdks')) {
binding.setVariable(
'buildJdks',
['11', '17', '19'] // Changes must be copied to matrix axes!
['11', '17', '20'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('testJdks')) {
binding.setVariable(
'testJdks',
['11', '17', '19'] // Changes must be copied to matrix axes!
['11', '17', '20'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('upstreamProjects')) {
Expand Down Expand Up @@ -786,7 +786,7 @@ pipeline {
axes {
axis {
name 'jdk'
values '11', '17', '19' // buildJdks
values '11', '17', '20' // buildJdks
}
}
stages {
Expand Down Expand Up @@ -832,11 +832,11 @@ pipeline {
axes {
axis {
name 'jdk'
values '11', '17', '19' // buildJdks
values '11', '17', '20' // buildJdks
}
axis {
name 'testJdk'
values '11', '17', '19' // testJdks
values '11', '17', '20' // testJdks
}
}
stages {
Expand Down
14 changes: 7 additions & 7 deletions book/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ def upstreamProjects = [
* Defaults to '17' *
* *
* buildJdks The array of JDK versions that will build. *
* Defaults to ['11', '17', '19'] *
* Defaults to ['11', '17', '20'] *
* Changes must be copied to matrix axes! *
* *
* testJdks The array of JDK versions that will test against every build JDK. *
* Defaults to ['11', '17', '19'] *
* Defaults to ['11', '17', '20'] *
* Changes must be copied to matrix axes! *
* *
* upstreamProjects The array of relative paths to upstream projects. *
Expand Down Expand Up @@ -169,13 +169,13 @@ if (!binding.hasVariable('deployJdk')) {
if (!binding.hasVariable('buildJdks')) {
binding.setVariable(
'buildJdks',
['11', '17', '19'] // Changes must be copied to matrix axes!
['11', '17', '20'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('testJdks')) {
binding.setVariable(
'testJdks',
['11', '17', '19'] // Changes must be copied to matrix axes!
['11', '17', '20'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('upstreamProjects')) {
Expand Down Expand Up @@ -783,7 +783,7 @@ pipeline {
axes {
axis {
name 'jdk'
values '11', '17', '19' // buildJdks
values '11', '17', '20' // buildJdks
}
}
stages {
Expand Down Expand Up @@ -829,11 +829,11 @@ pipeline {
axes {
axis {
name 'jdk'
values '11', '17', '19' // buildJdks
values '11', '17', '20' // buildJdks
}
axis {
name 'testJdk'
values '11', '17', '19' // testJdks
values '11', '17', '20' // testJdks
}
}
stages {
Expand Down

0 comments on commit b43aa94

Please sign in to comment.