diff --git a/Jenkinsfile b/Jenkinsfile index e399331..89b8acf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ #!/usr/bin/env groovy /* * semanticcms-parent - Parent POM for all SemanticCMS packages. - * 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 @@ -47,14 +47,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. * @@ -140,18 +140,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')) { @@ -781,7 +781,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 { @@ -827,11 +827,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 { diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 3a3f996..153c911 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -1,7 +1,7 @@ #!/usr/bin/env groovy /* * semanticcms-parent - Parent POM for all SemanticCMS packages. - * 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 @@ -56,14 +56,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. * @@ -149,18 +149,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')) { @@ -790,7 +790,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 { @@ -836,11 +836,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 { diff --git a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx index 14c4625..f67bea4 100644 --- a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx +++ b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx @@ -1,7 +1,7 @@