Merge pull request #17 from testcontainers/upgrade-libraries

Upgrade libraries

.github/workflows/deploy.yml

@@ -0,0 +1,18 @@
+name: "Deploy"
+
+on:
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'README.md'
+      - '.github/CODEOWNERS'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Deploy
+        run: |
+          curl -X POST -d {} ${{ secrets.NETLIFY_WEBHOOK_URL }}

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,19 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

.sdkmanrc

@@ -1,3 +1,3 @@
 java=17.0.8-tem
-gradle=8.4
-maven=3.9.4
+gradle=8.8
+maven=3.9.8

README.md

@@ -43,4 +43,15 @@ $ ./gradlew test //for Gradle
 $ ./mvnw verify  //for Maven
 ```
 
-The tests should pass.
+The tests should pass.
+
+> [!NOTE]
+> The project is configured to automate the code formatting with spotless plugin
+> using prettier-plugin-java, which internally requires Node.js runtime.
+> If you don't have Node.js installed and want to disable the code formatting,
+> you can pass additional parameter to the build command as shown below:
+
+```shell
+./gradlew build -x spotlessCheck //for Gradle
+./mvnw verify -Dspotless.check.skip=true //for Maven
+```

build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.0'
-    id 'io.spring.dependency-management' version '1.1.4'
-    id 'com.diffplug.spotless' version "6.23.0"
+    id 'org.springframework.boot' version '3.3.1'
+    id 'io.spring.dependency-management' version '1.1.5'
+    id 'com.diffplug.spotless' version "6.25.0"
 }
 
 group = 'com.testcontainers'
@@ -11,7 +11,6 @@ version = '1.0.0-SNAPSHOT'
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)
-        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
 
@@ -32,7 +31,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'com.github.dasniko:testcontainers-keycloak:3.2.0'
+    testImplementation 'com.github.dasniko:testcontainers-keycloak:3.4.0'
     testImplementation 'io.rest-assured:rest-assured'
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,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/.

gradlew.bat

@@ -43,11 +43,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 +57,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
 

guide/securing-spring-boot-microservice-using-keycloak-and-testcontainers/index.adoc

@@ -50,7 +50,7 @@ So, once the application is generated, add the following dependencies with *test
 
 [source,groovy]
 ----
-testImplementation 'com.github.dasniko:testcontainers-keycloak:3.2.0'
+testImplementation 'com.github.dasniko:testcontainers-keycloak:3.4.0'
 testImplementation 'io.rest-assured:rest-assured'
 ----
 
@@ -137,7 +137,7 @@ Start the Keycloak server using Docker as follows:
 $ docker run -p 9090:8080 \
     -e KEYCLOAK_ADMIN=admin \
     -e KEYCLOAK_ADMIN_PASSWORD=admin \
-    quay.io/keycloak/keycloak:23.0.1 start-dev
+    quay.io/keycloak/keycloak:25 start-dev
 ----
 
 Now you can go to http://localhost:9090 and login into Admin Console using the credentials *admin/admin*.
@@ -194,7 +194,7 @@ We registered a bean of type *PostgreSQLContainer* and also added *@ServiceConne
 which will start a PostgreSQL container and automatically register the DataSource properties.
 
 Next, we are registering a bean of type *KeycloakContainer* using the Docker image
-*quay.io/keycloak/keycloak:23.0.1* and importing the realm configuration file.
+*quay.io/keycloak/keycloak:25* and importing the realm configuration file.
 Then we are registering the dynamic JWT Issuer URI using *DynamicPropertyRegistry*
 by fetching the AuthServerUrl from the Keycloak container instance.