diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83769a8..87e1261 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7221fe..e50a49d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index ab84ae1..0fd86c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:22-alpine-jdk as jreBuilder +FROM amazoncorretto:23-alpine-jdk as jreBuilder RUN apk add binutils RUN jlink \ diff --git a/pom.xml b/pom.xml index 92fc0bd..66a25ca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.5 + 3.3.4 com.mangasite @@ -13,7 +13,8 @@ MangaBackend RSocket API for Manga-Spring Site - 22 + 23 + full 9.10 com.mangasite.MangaBackendApplication com.mangasite.MangaBackendApplication @@ -35,12 +36,12 @@ io.avaje avaje-config - 3.10 + 4.0 com.auth0 java-jwt - 4.2.0 + 4.4.0 @@ -92,7 +93,7 @@ com.google.errorprone error_prone_core - 2.15.0 + 2.32.0 provided diff --git a/src/main/java/com/mangasite/rsocket/RSocketMangaController.java b/src/main/java/com/mangasite/rsocket/RSocketMangaController.java index b3494cb..8922563 100644 --- a/src/main/java/com/mangasite/rsocket/RSocketMangaController.java +++ b/src/main/java/com/mangasite/rsocket/RSocketMangaController.java @@ -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; @@ -24,7 +25,7 @@ public RSocketMangaController(MangaService service) { @MessageMapping("get-mangas") public Flux getAll() { - return service.findAll(); + return service.findAll().doOnError(MongoTimeoutException.class, e -> System.exit(0)); } @MessageMapping("get-manga-{id}")