Skip to content

Commit

Permalink
Added support for Java 21.
Browse files Browse the repository at this point in the history
  • Loading branch information
ao-apps committed Jan 8, 2024
1 parent 4ec30ea commit 392d2d3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
20 changes: 10 additions & 10 deletions Jenkinsfile
@@ -1,7 +1,7 @@
#!/usr/bin/env groovy
/*
* ao-persistence - Highly efficient persistent collections for Java.
* Copyright (C) 2021, 2022, 2023 AO Industries, Inc.
* Copyright (C) 2021, 2022, 2023, 2024 AO Industries, Inc.
* support@aoindustries.com
* 7262 Bull Pen Cir
* Mobile, AL 36695
Expand Down Expand Up @@ -57,14 +57,14 @@ 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 '20' *
* Defaults to '21' *
* *
* buildJdks The array of JDK versions that will build. *
* Defaults to ['11', '17', '20'] *
* Defaults to ['11', '17', '21'] *
* Changes must be copied to matrix axes! *
* *
* testJdks The array of JDK versions that will test against every build JDK. *
* Defaults to ['11', '17', '20'] *
* Defaults to ['11', '17', '21'] *
* Changes must be copied to matrix axes! *
* *
* upstreamProjects The array of relative paths to upstream projects. *
Expand Down Expand Up @@ -150,18 +150,18 @@ def upstreamProjects = [

// JDK versions
if (!binding.hasVariable('deployJdk')) {
binding.setVariable('deployJdk', '20')
binding.setVariable('deployJdk', '21')
}
if (!binding.hasVariable('buildJdks')) {
binding.setVariable(
'buildJdks',
['11', '17', '20'] // Changes must be copied to matrix axes!
['11', '17', '21'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('testJdks')) {
binding.setVariable(
'testJdks',
['11', '17', '20'] // Changes must be copied to matrix axes!
['11', '17', '21'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('upstreamProjects')) {
Expand Down Expand Up @@ -791,7 +791,7 @@ or any build that adds or removes build artifacts."""
axes {
axis {
name 'jdk'
values '11', '17', '20' // buildJdks
values '11', '17', '21' // buildJdks
}
}
stages {
Expand Down Expand Up @@ -837,11 +837,11 @@ or any build that adds or removes build artifacts."""
axes {
axis {
name 'jdk'
values '11', '17', '20' // buildJdks
values '11', '17', '21' // buildJdks
}
axis {
name 'testJdk'
values '11', '17', '20' // testJdks
values '11', '17', '21' // testJdks
}
}
stages {
Expand Down
20 changes: 10 additions & 10 deletions book/Jenkinsfile
@@ -1,7 +1,7 @@
#!/usr/bin/env groovy
/*
* ao-persistence - Highly efficient persistent collections for Java.
* Copyright (C) 2021, 2022, 2023 AO Industries, Inc.
* Copyright (C) 2021, 2022, 2023, 2024 AO Industries, Inc.
* support@aoindustries.com
* 7262 Bull Pen Cir
* Mobile, AL 36695
Expand Down Expand Up @@ -61,14 +61,14 @@ 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 '20' *
* Defaults to '21' *
* *
* buildJdks The array of JDK versions that will build. *
* Defaults to ['11', '17', '20'] *
* Defaults to ['11', '17', '21'] *
* Changes must be copied to matrix axes! *
* *
* testJdks The array of JDK versions that will test against every build JDK. *
* Defaults to ['11', '17', '20'] *
* Defaults to ['11', '17', '21'] *
* Changes must be copied to matrix axes! *
* *
* upstreamProjects The array of relative paths to upstream projects. *
Expand Down Expand Up @@ -154,18 +154,18 @@ def upstreamProjects = [

// JDK versions
if (!binding.hasVariable('deployJdk')) {
binding.setVariable('deployJdk', '20')
binding.setVariable('deployJdk', '21')
}
if (!binding.hasVariable('buildJdks')) {
binding.setVariable(
'buildJdks',
['11', '17', '20'] // Changes must be copied to matrix axes!
['11', '17', '21'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('testJdks')) {
binding.setVariable(
'testJdks',
['11', '17', '20'] // Changes must be copied to matrix axes!
['11', '17', '21'] // Changes must be copied to matrix axes!
)
}
if (!binding.hasVariable('upstreamProjects')) {
Expand Down Expand Up @@ -795,7 +795,7 @@ or any build that adds or removes build artifacts."""
axes {
axis {
name 'jdk'
values '11', '17', '20' // buildJdks
values '11', '17', '21' // buildJdks
}
}
stages {
Expand Down Expand Up @@ -841,11 +841,11 @@ or any build that adds or removes build artifacts."""
axes {
axis {
name 'jdk'
values '11', '17', '20' // buildJdks
values '11', '17', '21' // buildJdks
}
axis {
name 'testJdk'
values '11', '17', '20' // testJdks
values '11', '17', '21' // testJdks
}
}
stages {
Expand Down
4 changes: 2 additions & 2 deletions book/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
ao-persistence - Highly efficient persistent collections for Java.
Copyright (C) 2020, 2021, 2022, 2023 AO Industries, Inc.
Copyright (C) 2020, 2021, 2022, 2023, 2024 AO Industries, Inc.
support@aoindustries.com
7262 Bull Pen Cir
Mobile, AL 36695
Expand Down Expand Up @@ -169,7 +169,7 @@ along with ao-persistence. If not, see <https://www.gnu.org/licenses/>.
<dependencies>
<!-- Direct -->
<dependency>
<groupId>com.aoapps</groupId><artifactId>ao-badges</artifactId><version>1.10.1${POST-SNAPSHOT}</version>
<groupId>com.aoapps</groupId><artifactId>ao-badges</artifactId><version>1.11.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
</dependency>
<dependency>
<groupId>com.aoapps</groupId><artifactId>ao-taglib</artifactId><version>8.0.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
Expand Down

0 comments on commit 392d2d3

Please sign in to comment.