Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK 23 #60

Merged
merged 5 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
uses: oracle-actions/setup-java@v1
with:
java-version: ${{ matrix.java_version }}
distribution: 'corretto'
website: jdk.java.net
release: GA
- name: Maven cache
uses: actions/cache@v4
env:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ jobs:
uses: actions/checkout@v2

- name: Setup Java
uses: actions/setup-java@v1
uses: oracle-actions/setup-java@v1
with:
java-version: "22"
java-package: jdk
architecture: x64
website: jdk.java.net
release: GA

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazoncorretto:22-alpine-jdk as jreBuilder
FROM amazoncorretto:23-alpine-jdk as jreBuilder

RUN apk add binutils
RUN jlink \
Expand Down
11 changes: 6 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.5</version>
<version>3.3.4</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.mangasite</groupId>
Expand All @@ -13,7 +13,8 @@
<name>MangaBackend</name>
<description>RSocket API for Manga-Spring Site</description>
<properties>
<java.version>22</java.version>
<java.version>23</java.version>
<maven.compiler.proc>full</maven.compiler.proc>
<avaje.inject.version>9.10</avaje.inject.version>
<mainClass>com.mangasite.MangaBackendApplication</mainClass>
<start-class>com.mangasite.MangaBackendApplication</start-class>
Expand All @@ -35,12 +36,12 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-config</artifactId>
<version>3.10</version>
<version>4.0</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>4.2.0</version>
<version>4.4.0</version>
</dependency>
<!-- Boot Dependencies -->
<dependency>
Expand Down Expand Up @@ -92,7 +93,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.15.0</version>
<version>2.32.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import com.mangasite.domain.Manga;
import com.mangasite.services.MangaService;
import com.mongodb.MongoTimeoutException;

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

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

@MessageMapping("get-manga-{id}")
Expand Down