Skip to content

Commit 2c8849b

Browse files
committed
Upgrade to Java 17
1 parent fbb417a commit 2c8849b

File tree

19 files changed

+50
-51
lines changed

19 files changed

+50
-51
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
with:
1515
repository: ISAITB/itb-commons
1616
path: commons
17-
- name: Set up JDK 11
17+
- name: Set up JDK 17
1818
uses: actions/setup-java@v3
1919
with:
20-
distribution: 'adopt'
21-
java-version: '11'
20+
distribution: 'temurin'
21+
java-version: '17'
2222
- name: Cache local Maven repository
2323
uses: actions/cache@v3
2424
with:

.github/workflows/quality.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
with:
1818
repository: ISAITB/itb-commons
1919
path: commons
20-
- name: Set up JDK 11
20+
- name: Set up JDK 17
2121
uses: actions/setup-java@v3
2222
with:
23-
distribution: 'adopt'
24-
java-version: '11'
23+
distribution: 'temurin'
24+
java-version: '17'
2525
- name: Cache SonarCloud packages
2626
uses: actions/cache@v3
2727
with:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ from module `jsonvalidator-war`. This is an all-in-one Spring Boot web applicati
7373
## Prerequisites
7474

7575
To build this project's libraries you require:
76-
* A JDK installation (11+).
76+
* A JDK installation (17+).
7777
* Maven (3+)
7878
* Locally installed [itb-commons](https://github.com/ISAITB/itb-commons) dependencies (see below).
7979

etc/docker/json-validator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:11.0.14-jre
1+
FROM eclipse-temurin:17-jdk-alpine
22

33
RUN mkdir /validator
44
COPY validator.jar /validator

jsonvalidator-common/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependencies>
1414
<dependency>
1515
<groupId>eu.europa.ec.itb</groupId>
16-
<artifactId>gitb-types</artifactId>
16+
<artifactId>gitb-types-jakarta</artifactId>
1717
</dependency>
1818
<dependency>
1919
<groupId>eu.europa.ec.itb.commons</groupId>
@@ -48,8 +48,8 @@
4848
<artifactId>spring-boot-starter</artifactId>
4949
</dependency>
5050
<dependency>
51-
<groupId>javax.annotation</groupId>
52-
<artifactId>javax.annotation-api</artifactId>
51+
<groupId>jakarta.annotation</groupId>
52+
<artifactId>jakarta.annotation-api</artifactId>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.commons</groupId>

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/ApplicationConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.springframework.boot.context.properties.ConfigurationProperties;
55
import org.springframework.stereotype.Component;
66

7-
import javax.annotation.PostConstruct;
7+
import jakarta.annotation.PostConstruct;
88
import java.util.HashMap;
99
import java.util.Map;
1010
import java.util.Set;

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/DomainConfigCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.stereotype.Component;
99

10-
import javax.annotation.PostConstruct;
10+
import jakarta.annotation.PostConstruct;
1111
import java.util.Arrays;
1212

1313
import static eu.europa.ec.itb.validation.commons.config.ParseUtils.addMissingDefaultValues;

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/LocalSchemaCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.stereotype.Component;
1313

14-
import javax.annotation.PostConstruct;
14+
import jakarta.annotation.PostConstruct;
1515
import java.io.File;
1616
import java.io.FileReader;
1717
import java.io.IOException;

jsonvalidator-jar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</dependency>
6363
<dependency>
6464
<groupId>eu.europa.ec.itb</groupId>
65-
<artifactId>gitb-types</artifactId>
65+
<artifactId>gitb-types-jakarta</artifactId>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.springframework.boot</groupId>

jsonvalidator-service/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<artifactId>spring-boot-starter-web</artifactId>
2222
</dependency>
2323
<dependency>
24-
<groupId>javax.annotation</groupId>
25-
<artifactId>javax.annotation-api</artifactId>
24+
<groupId>jakarta.annotation</groupId>
25+
<artifactId>jakarta.annotation-api</artifactId>
2626
</dependency>
2727
<dependency>
2828
<groupId>eu.europa.ec.itb</groupId>
29-
<artifactId>gitb-types</artifactId>
29+
<artifactId>gitb-types-jakarta</artifactId>
3030
</dependency>
3131
<dependency>
3232
<groupId>eu.europa.ec.itb.commons</groupId>
@@ -45,12 +45,12 @@
4545
<artifactId>commons-io</artifactId>
4646
</dependency>
4747
<dependency>
48-
<groupId>javax.xml.ws</groupId>
49-
<artifactId>jaxws-api</artifactId>
48+
<groupId>jakarta.xml.ws</groupId>
49+
<artifactId>jakarta.xml.ws-api</artifactId>
5050
</dependency>
5151
<dependency>
52-
<groupId>javax.jws</groupId>
53-
<artifactId>javax.jws-api</artifactId>
52+
<groupId>jakarta.jws</groupId>
53+
<artifactId>jakarta.jws-api</artifactId>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
 (0)