Skip to content

Commit 2984b0e

Browse files
feat: Move to Java 21 (#10)
* Switch to java 21 Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com> * Fixed typo Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com> --------- Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>
1 parent 568f9bf commit 2984b0e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

vars/continuousIntegrationPipeline.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def call(Map pipelineParams = [:]) {
2929

3030
// Populate keys that are not set with default parameters
3131
def defaultParameters = [
32-
toolchain: [ jdk: "temurin-jdk17-latest", maven: "apache-maven-3.9.6" ],
32+
toolchain: [ jdk: "temurin-jdk21-latest", maven: "apache-maven-3.9.9" ],
3333
buildType: "install",
3434
sonar: [ enable: false, projectKey: null, tokenId: null, exclusions: "tests/**/*,**/*.xml,**/*.yml", testExclusions: "**/*" ],
3535
pushArtifacts: true
@@ -46,8 +46,8 @@ def call(Map pipelineParams = [:]) {
4646
assert pipelineParams.buildType.equals("install") || pipelineParams.buildType.equals("deploy")
4747

4848
// Check toolchain option is set and valid
49-
def valid_jdks = [ "temurin-jdk17-latest" ]
50-
def valid_mavens = [ "apache-maven-3.9.6" ]
49+
def valid_jdks = [ "temurin-jdk21-latest" ]
50+
def valid_mavens = [ "apache-maven-3.9.9" ]
5151

5252
assert pipelineParams.toolchain
5353
assert pipelineParams.toolchain.jdk instanceof String
@@ -145,7 +145,7 @@ def call(Map pipelineParams = [:]) {
145145
if (pipelineParams.sonar.enable) {
146146
timeout(time: 2, unit: 'HOURS') {
147147
dir("workdir") {
148-
withMaven(jdk: 'temurin-jdk17-latest', maven: 'apache-maven-3.9.6', options: [artifactsPublisher(disabled: true)]) {
148+
withMaven(jdk: 'temurin-jdk21-latest', maven: 'apache-maven-3.9.9', options: [artifactsPublisher(disabled: true)]) {
149149
withSonarQubeEnv( credentialsId: pipelineParams.sonar.tokenId ) {
150150

151151
// Check if on primary branch

vars/continuousIntegrationPipeline.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
- `projectKey`: Sonar unique identifier for the project. Can be found on the SonarQube instance. **Must be set if Sonar scan is enabled**
1212
- `exclusions`: Source path to be excluded from Sonar analysis. Default value: `tests/**/*,**/*.xml,**/*.yml`. **Must be set if Sonar scan is enabled**
1313
- `testExclusions`: Test path to be excluded from Sonar analysis. Default value: `**/*`. **Must be set if Sonar scan is enabled**
14-
- [Optional] `toolchain`: The toolchain to be used for the build. Default value: `[ jdk: "temurin-jdk17-latest", maven: "apache-maven-3.9.6" ]`. Available values:
15-
- **jdk**: `temurin-jdk17-latest`
16-
- **maven**: `apache-maven-3.9.6`
14+
- [Optional] `toolchain`: The toolchain to be used for the build. Default value: `[ jdk: "temurin-jdk21-latest", maven: "apache-maven-3.9.9" ]`. Available values:
15+
- **jdk**: `temurin-jdk21-latest`
16+
- **maven**: `apache-maven-3.9.9`
1717

1818
## Example caller pipeline script:
1919

0 commit comments

Comments
 (0)