Skip to content

Commit b7af422

Browse files
nomanAli95nomanAli95
authored
build: upgrade JDK from 17 to 21 (#29)
- Add slf4j-api and logback dependencies for logs - Update testcontainers version from 1.21.3 to 2.0.2 to be compatible with docker newer versions - Update docker-compose.yaml using devel images to fix IT test ref: CO-2825
1 parent 03fe79e commit b7af422

4 files changed

Lines changed: 47 additions & 15 deletions

File tree

‎Jenkinsfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pipeline {
6767

6868
stage('Build') {
6969
steps {
70-
container('jdk-17') {
70+
container('jdk-21') {
7171
withCredentials([file(credentialsId: 'jenkins-maven-settings.xml', variable: 'SETTINGS_PATH')]) {
7272
sh 'mvn -B -s $SETTINGS_PATH package'
7373
}
@@ -79,7 +79,7 @@ pipeline {
7979
expression { params.SKIP_TESTS == false }
8080
}
8181
steps {
82-
container('jdk-17') {
82+
container('jdk-21') {
8383
withCredentials([file(credentialsId: 'jenkins-maven-settings.xml', variable: 'SETTINGS_PATH')]) {
8484
sh 'mvn -B -s $SETTINGS_PATH verify -P run-unit-tests'
8585
}
@@ -93,7 +93,7 @@ pipeline {
9393
steps {
9494
container('dind') {
9595
withDockerRegistry(credentialsId: 'private-registry', url: 'https://registry.dev.zextras.com') {
96-
container('jdk-17') {
96+
container('jdk-21') {
9797
withCredentials([file(credentialsId: 'jenkins-maven-settings.xml', variable: 'SETTINGS_PATH')]) {
9898
sh 'mvn -B -s $SETTINGS_PATH verify -P run-integration-tests'
9999
}
@@ -107,7 +107,7 @@ pipeline {
107107
expression { params.SKIP_CHECKS == false }
108108
}
109109
steps {
110-
container('jdk-17') {
110+
container('jdk-21') {
111111
withCredentials([file(credentialsId: 'jenkins-maven-settings.xml', variable: 'SETTINGS_PATH')]) {
112112
sh 'mvn -B -s $SETTINGS_PATH verify -P generate-jacoco-full-report'
113113
recordCoverage(tools: [[parser: 'JACOCO']], sourceCodeRetention: 'MODIFIED')
@@ -166,7 +166,7 @@ pipeline {
166166
if (env.TAG_NAME) {
167167
profile = '-P prod'
168168
}
169-
container('jdk-17') {
169+
container('jdk-21') {
170170
withCredentials([file(credentialsId: 'jenkins-maven-settings.xml', variable: 'SETTINGS_PATH')]) {
171171
sh "mvn -B -s \$SETTINGS_PATH ${profile} deploy"
172172
}

‎docker/minimal/docker-compose.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
mailbox:
3-
image: registry.dev.zextras.com/dev/carbonio-mailbox:latest
3+
image: registry.dev.zextras.com/dev/carbonio-mailbox:devel
44
hostname: docker.carbonio.localhost
55
restart: on-failure
66
networks:
@@ -37,7 +37,7 @@ services:
3737
restart: "no"
3838

3939
openldap:
40-
image: registry.dev.zextras.com/dev/carbonio-openldap:latest
40+
image: registry.dev.zextras.com/dev/carbonio-openldap:devel
4141
restart: on-failure
4242
networks:
4343
- carbonio-user-management-network
@@ -51,7 +51,7 @@ services:
5151
timeout: 10s
5252

5353
mariadb:
54-
image: registry.dev.zextras.com/dev/carbonio-mariadb:latest
54+
image: registry.dev.zextras.com/dev/carbonio-mariadb:devel
5555
networks:
5656
- carbonio-user-management-network
5757
ports:
@@ -74,7 +74,7 @@ services:
7474
condition: service_healthy
7575

7676
user-management:
77-
image: registry.dev.zextras.com/dev/carbonio-user-management:latest
77+
image: registry.dev.zextras.com/dev/carbonio-user-management:devel
7878
restart: on-failure
7979
networks:
8080
- carbonio-user-management-network

‎pom.xml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ SPDX-License-Identifier: AGPL-3.0-only
1818
<name>carbonio-user-management-sdk</name>
1919

2020
<properties>
21-
<maven.compiler.source>17</maven.compiler.source>
22-
<maven.compiler.target>17</maven.compiler.target>
21+
<maven.compiler.source>21</maven.compiler.source>
22+
<maven.compiler.target>21</maven.compiler.target>
2323
<maven.version.ignore>(?i).*-(alpha|beta|m|rc)([-.]?\d+)?</maven.version.ignore>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2525

@@ -33,13 +33,16 @@ SPDX-License-Identifier: AGPL-3.0-only
3333
<jackson.version>2.19.2</jackson.version>
3434
<vavr.version>0.10.7</vavr.version>
3535
<junit-jupiter.version>5.12.1</junit-jupiter.version>
36-
<testcontainers.version>1.21.3</testcontainers.version>
36+
<slf4j.api.version>2.0.17</slf4j.api.version>
37+
<logback.classic.version>1.5.21</logback.classic.version>
38+
<testcontainers.version>2.0.2</testcontainers.version>
39+
<testcontainers.jupiter.version>1.21.3</testcontainers.jupiter.version>
3740

3841
<!-- Plugins -->
3942
<maven-compiler.version>3.13.0</maven-compiler.version>
4043
<maven-failsafe.version>3.5.3</maven-failsafe.version>
4144
<maven-jacoco.version>0.8.12</maven-jacoco.version>
42-
<maven-surfire.version>3.5.3</maven-surfire.version>
45+
<maven-surefire.version>3.5.4</maven-surefire.version>
4346

4447
<!-- Flags to skip/run tests and the report generation -->
4548
<skip.integration.tests>true</skip.integration.tests>
@@ -78,18 +81,32 @@ SPDX-License-Identifier: AGPL-3.0-only
7881
<version>${vavr.version}</version>
7982
</dependency>
8083

84+
<dependency>
85+
<groupId>org.slf4j</groupId>
86+
<artifactId>slf4j-api</artifactId>
87+
<version>${slf4j.api.version}</version>
88+
</dependency>
89+
90+
<dependency>
91+
<groupId>ch.qos.logback</groupId>
92+
<artifactId>logback-classic</artifactId>
93+
<version>${logback.classic.version}</version>
94+
</dependency>
95+
8196
<dependency>
8297
<groupId>org.junit.jupiter</groupId>
8398
<artifactId>junit-jupiter</artifactId>
8499
<version>${junit-jupiter.version}</version>
85100
<scope>test</scope>
86101
</dependency>
102+
87103
<dependency>
88104
<groupId>org.testcontainers</groupId>
89105
<artifactId>junit-jupiter</artifactId>
90-
<version>${testcontainers.version}</version>
106+
<version>${testcontainers.jupiter.version}</version>
91107
<scope>test</scope>
92108
</dependency>
109+
93110
<dependency>
94111
<groupId>org.testcontainers</groupId>
95112
<artifactId>testcontainers</artifactId>
@@ -110,7 +127,7 @@ SPDX-License-Identifier: AGPL-3.0-only
110127
<plugin>
111128
<groupId>org.apache.maven.plugins</groupId>
112129
<artifactId>maven-surefire-plugin</artifactId>
113-
<version>${maven-surfire.version}</version>
130+
<version>${maven-surefire.version}</version>
114131
<configuration>
115132
<skipTests>${skip.unit.tests}</skipTests>
116133
</configuration>

‎src/test/resources/logback-test.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<logger name="org.testcontainers" level="INFO"/>
9+
<logger name="com.github.dockerjava" level="WARN"/>
10+
<logger name="tc" level="INFO"/>
11+
12+
<root level="WARN">
13+
<appender-ref ref="STDOUT"/>
14+
</root>
15+
</configuration>

0 commit comments

Comments
 (0)