Skip to content

Commit 80f2daa

Browse files
authored
JDK 23 (#60)
* JDK 22 * update workflow * java23
1 parent a4964f6 commit 80f2daa

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Set up Java
20-
uses: actions/setup-java@v4
20+
uses: oracle-actions/setup-java@v1
2121
with:
22-
java-version: ${{ matrix.java_version }}
23-
distribution: 'corretto'
22+
website: jdk.java.net
23+
release: GA
2424
- name: Maven cache
2525
uses: actions/cache@v4
2626
env:

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ jobs:
1919
uses: actions/checkout@v2
2020

2121
- name: Setup Java
22-
uses: actions/setup-java@v1
22+
uses: oracle-actions/setup-java@v1
2323
with:
24-
java-version: "22"
25-
java-package: jdk
26-
architecture: x64
24+
website: jdk.java.net
25+
release: GA
2726

2827
- name: Setup Docker Buildx
2928
uses: docker/setup-buildx-action@v1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM amazoncorretto:22-alpine-jdk as jreBuilder
1+
FROM amazoncorretto:23-alpine-jdk as jreBuilder
22

33
RUN apk add binutils
44
RUN jlink \

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.1.5</version>
7+
<version>3.3.4</version>
88
<relativePath /> <!-- lookup parent from repository -->
99
</parent>
1010
<groupId>com.mangasite</groupId>
@@ -13,7 +13,8 @@
1313
<name>MangaBackend</name>
1414
<description>RSocket API for Manga-Spring Site</description>
1515
<properties>
16-
<java.version>22</java.version>
16+
<java.version>23</java.version>
17+
<maven.compiler.proc>full</maven.compiler.proc>
1718
<avaje.inject.version>9.10</avaje.inject.version>
1819
<mainClass>com.mangasite.MangaBackendApplication</mainClass>
1920
<start-class>com.mangasite.MangaBackendApplication</start-class>
@@ -35,12 +36,12 @@
3536
<dependency>
3637
<groupId>io.avaje</groupId>
3738
<artifactId>avaje-config</artifactId>
38-
<version>3.10</version>
39+
<version>4.0</version>
3940
</dependency>
4041
<dependency>
4142
<groupId>com.auth0</groupId>
4243
<artifactId>java-jwt</artifactId>
43-
<version>4.2.0</version>
44+
<version>4.4.0</version>
4445
</dependency>
4546
<!-- Boot Dependencies -->
4647
<dependency>
@@ -92,7 +93,7 @@
9293
<dependency>
9394
<groupId>com.google.errorprone</groupId>
9495
<artifactId>error_prone_core</artifactId>
95-
<version>2.15.0</version>
96+
<version>2.32.0</version>
9697
<scope>provided</scope>
9798
</dependency>
9899
<dependency>

src/main/java/com/mangasite/rsocket/RSocketMangaController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import com.mangasite.domain.Manga;
88
import com.mangasite.services.MangaService;
9+
import com.mongodb.MongoTimeoutException;
910

1011
import io.rsocket.exceptions.CustomRSocketException;
1112
import jakarta.inject.Singleton;
@@ -24,7 +25,7 @@ public RSocketMangaController(MangaService service) {
2425

2526
@MessageMapping("get-mangas")
2627
public Flux<Manga> getAll() {
27-
return service.findAll();
28+
return service.findAll().doOnError(MongoTimeoutException.class, e -> System.exit(0));
2829
}
2930

3031
@MessageMapping("get-manga-{id}")

0 commit comments

Comments
 (0)