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 Jan 8, 2024
2 parents a2dcc1b + 4665267 commit 4ae91ad
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 22 deletions.
20 changes: 10 additions & 10 deletions Jenkinsfile
View file
@@ -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
Expand Down Expand Up @@ -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. *
Expand Down Expand Up @@ -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')) {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
20 changes: 10 additions & 10 deletions book/Jenkinsfile
View file
@@ -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
Expand Down Expand Up @@ -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. *
Expand Down Expand Up @@ -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')) {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
11 changes: 9 additions & 2 deletions book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
semanticcms-parent - Parent POM for all SemanticCMS packages.
Copyright (C) 2016, 2017, 2019, 2020, 2021, 2022, 2023 AO Industries, Inc.
Copyright (C) 2016, 2017, 2019, 2020, 2021, 2022, 2023, 2024 AO Industries, Inc.
support@aoindustries.com
7262 Bull Pen Cir
Mobile, AL 36695
Expand Down Expand Up @@ -37,7 +37,7 @@ along with semanticcms-parent. If not, see <https://www.gnu.org/licenses/>.
shortTitle="Changelog"
tocLevels="1"
datePublished="2016-11-13T18:03:31-06:00"
dateModified="2023-12-05T00:59:05Z"
dateModified="2024-01-08T00:08:41Z"
allowRobots="false"
>
<c:set var="latestRelease" value="1.20.1" />
Expand All @@ -62,6 +62,13 @@ along with semanticcms-parent. If not, see <https://www.gnu.org/licenses/>.
to 3.6.3. <ao:a href="https://issues.apache.org/jira/projects/MJAVADOC/issues/MJAVADOC-682">MJAVADOC-682</ao:a>
is resolved so removed the "reactor" profile.
</li>
<li>Java updates:
<ol>
<li>Java 20 is now end-of-life</li>
<li>Java 21 is now current stable</li>
<li>Java 22 is new beta</li>
</ol>
</li>
</ul>
</changelog:release>
</c:if>
Expand Down

0 comments on commit 4ae91ad

Please sign in to comment.