From a5dac068d1dede95769b7112a2126a32a5412d68 Mon Sep 17 00:00:00 2001
From: Raja Kolli <rajadilipkolli@gmail.com>
Date: Tue, 14 Nov 2023 12:40:15 +0530
Subject: [PATCH] #876 - Upgrade to Java 21

---
 .github/workflows/batch-boot-jpa-sample.yml   |  4 +--
 batch-boot-jpa-sample/pom.xml                 | 27 ++++++++++++++++---
 .../common/TestContainersConfig.java          |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/batch-boot-jpa-sample.yml b/.github/workflows/batch-boot-jpa-sample.yml
index f58b70b01..9544f393f 100644
--- a/.github/workflows/batch-boot-jpa-sample.yml
+++ b/.github/workflows/batch-boot-jpa-sample.yml
@@ -23,13 +23,13 @@ jobs:
     strategy:
       matrix:
         distribution: [ 'microsoft' ]
-        java: [ '17' ]
+        java: [ '21' ]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 17
+      - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3.13.0
         with:
           java-version: ${{ matrix.java }}
diff --git a/batch-boot-jpa-sample/pom.xml b/batch-boot-jpa-sample/pom.xml
index 9d0028f33..7dfcffaab 100644
--- a/batch-boot-jpa-sample/pom.xml
+++ b/batch-boot-jpa-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.0-RC2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.bootbatchjpa</groupId>
@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <instancio.version>3.6.0</instancio.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
        
@@ -247,7 +247,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.17.0</version>
+                            <version>1.18.1</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                         <importOrder />
@@ -361,4 +361,25 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>
diff --git a/batch-boot-jpa-sample/src/test/java/com/example/bootbatchjpa/common/TestContainersConfig.java b/batch-boot-jpa-sample/src/test/java/com/example/bootbatchjpa/common/TestContainersConfig.java
index 3c7fa5261..346456e56 100644
--- a/batch-boot-jpa-sample/src/test/java/com/example/bootbatchjpa/common/TestContainersConfig.java
+++ b/batch-boot-jpa-sample/src/test/java/com/example/bootbatchjpa/common/TestContainersConfig.java
@@ -6,5 +6,5 @@
 public interface TestContainersConfig {
 
     @ServiceConnection
-    PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.0-alpine");
+    PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.1-alpine");
 }