Project upgrade

- upgrade to spring-boot 3.3.5; - upgrade to Java 21; - upgrade to jib 3.4.4; - upgrade to graddle 8.10.2; - upgrade to mongo docker image 7.0.14; - upgrade to keycloak docker image 26.0.1; - update README.

Author: Ivan Franchin

README.md

@@ -2,9 +2,9 @@
 
 The goals of this project are:
 
-- Create a [`Spring Boot`](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/) application that manages books, called `book-service`;
+- Create a [`Spring Boot`](https://docs.spring.io/spring-boot/index.html) application that manages books, called `book-service`;
 - Use [`Keycloak`](https://www.keycloak.org) as OpenID Connect Provider;
-- Test using [`Testcontainers`](https://www.testcontainers.org/);
+- Test using [`Testcontainers`](https://testcontainers.com/);
 - Explore the utilities and annotations that `Spring Boot` provides when testing applications.
 
 ## Proof-of-Concepts & Articles
@@ -14,8 +14,8 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 ## Additional Readings
 
 - \[**Medium**\] [**Implementing and Securing a Simple Spring Boot REST API with Keycloak**](https://medium.com/@ivangfr/how-to-secure-a-spring-boot-app-with-keycloak-5a931ee12c5a)
-- \[**Medium**\] [**Implementing and Securing a Simple Spring Boot UI (Thymeleaf + RBAC) with Keycloak**](https://medium.com/spring-boot/how-to-secure-a-simple-spring-boot-ui-thymeleaf-rbac-with-keycloak-ba9f30b9cb2b)
-- \[**Medium**\] [**Implementing and Securing a Spring Boot GraphQL API with Keycloak**](https://medium.com/javarevisited/implementing-and-securing-a-spring-boot-graphql-api-with-keycloak-c461c86e3972)
+- \[**Medium**\] [**Implementing and Securing a Simple Spring Boot UI (Thymeleaf + RBAC) with Keycloak**](https://medium.com/@ivangfr/how-to-secure-a-simple-spring-boot-ui-thymeleaf-rbac-with-keycloak-ba9f30b9cb2b)
+- \[**Medium**\] [**Implementing and Securing a Spring Boot GraphQL API with Keycloak**](https://medium.com/@ivangfr/implementing-and-securing-a-spring-boot-graphql-api-with-keycloak-c461c86e3972)
 - \[**Medium**\] [**Building a Single Spring Boot App with Keycloak or Okta as IdP: Introduction**](https://medium.com/@ivangfr/building-a-single-spring-boot-app-with-keycloak-or-okta-as-idp-introduction-2814a4829aed)
 
 ## Application
@@ -28,9 +28,9 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 
 ## Prerequisites
 
-- [`Java 17+`](https://www.oracle.com/java/technologies/downloads/#java17)
+- [`Java 21+`](https://www.oracle.com/java/technologies/downloads/#java21)
 - [`Docker`](https://www.docker.com/)
-- [`jq`](https://stedolan.github.io/jq)
+- [`jq`](https://jqlang.github.io/jq/)
 
 ## Start Environment
 

book-service/build.gradle

@@ -1,12 +1,18 @@
 plugins {
- id 'org.springframework.boot' version '3.2.4'
- id 'io.spring.dependency-management' version '1.1.4'
- id 'com.google.cloud.tools.jib' version '3.4.1'
+ id 'java'
+ id 'org.springframework.boot' version '3.3.5'
+ id 'io.spring.dependency-management' version '1.1.6'
+ id 'com.google.cloud.tools.jib' version '3.4.4'
 }
 
 group = 'com.ivanfranchin'
 version = '1.0.0'
-sourceCompatibility = 17
+
+java {
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(21)
+ }
+}
 
 configurations {
  compileOnly {
@@ -24,10 +30,10 @@ repositories {
 ext {
  set('mapstructVersion', '1.5.5.Final')
  set('lombokMapstructBindingVersion', '0.2.0')
- set('springdocOpenApiVersion', '2.4.0')
- set('keycloakVersion', '24.0.1')
+ set('springdocOpenApiVersion', '2.6.0')
+ set('keycloakVersion', '26.0.1')
  set('httpClient5Version', '5.3.1')
- set('jdkImageVersion', '17.0.10')
+ set('jdkImageVersion', '21.0.4')
  set('dockerImagePrefix', 'ivanfranchin')
 }
 

book-service/src/integration-test/java/com/ivanfranchin/bookservice/AbstractTestcontainers.java

@@ -26,9 +26,9 @@ public abstract class AbstractTestcontainers {
 
  @Container
  @ServiceConnection
- private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0.6");
+ private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0.14");
 
- private static final GenericContainer<?> keycloakContainer = new GenericContainer<>("quay.io/keycloak/keycloak:24.0.1");
+ private static final GenericContainer<?> keycloakContainer = new GenericContainer<>("quay.io/keycloak/keycloak:26.0.1");
 
  protected static Keycloak keycloakBookService;
 

book-service/src/test/java/com/ivanfranchin/bookservice/repository/BookRepositoryTest.java

@@ -23,7 +23,7 @@ class BookRepositoryTest {
 
  @Container
  @ServiceConnection
- private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0.6");
+ private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0.14");
 
  @Autowired
  private MongoTemplate mongoTemplate;

gradle/wrapper/gradle-wrapper.jar

@@ -1,22 +1,6 @@
-#
-# Copyright 2012-2024 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-MONGO_VERSION="7.0.6"
-KEYCLOAK_VERSION="24.0.1"
+MONGO_VERSION="7.0.14"
+KEYCLOAK_VERSION="26.0.1"
 
 source scripts/my-functions.sh