feat: upgrade to java 21

.github/workflows/aws-cloudwatch-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
 
       - name: Build and analyze

.github/workflows/aws-dynamo-main.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: ${{ matrix.distribution }}
+          distribution: temurin
           cache: 'maven'
 
       - name: Build with Maven

.github/workflows/aws-kinesis-consumer-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
 
       - name: Build and analyze

.github/workflows/aws-kinesis-producer-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
 
       - name: Build and analyze

.github/workflows/aws-parameterstore-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
       - name: Build and analyze
         run: ./mvnw clean verify

.github/workflows/aws-s3-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
 
       - name: Build and analyze

.github/workflows/aws-secretmanager-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
       - name: Build and analyze
         run: ./mvnw clean verify

.github/workflows/aws-ses-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
 
       - name: Build and analyze

.github/workflows/aws-sqs-main.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: 21
+          distribution: 'temurin'
           cache: 'maven'
 
       - name: Build and analyze

.github/workflows/sonarbuild.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 17
-          distribution: 'zulu' # Alternative distribution options are available.
+          java-version: 21
+          distribution: 'temurin' # Alternative distribution options are available.
           cache: 'maven'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3

.gitpod.Dockerfile

@@ -3,5 +3,5 @@ FROM gitpod/workspace-full:latest
 USER gitpod
 
 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
-             && sdk install java 17.0.7-tem \
-             && sdk default java 17.0.7-tem"
+             && sdk install java 21.0.1-tem \
+             && sdk default java 21.0.1-tem"

.gitpod.yml

@@ -1,11 +1,10 @@
-github:
-  prebuilds:
-    addComment: false
-    addBadge: true
-
 image:
   file: .gitpod.Dockerfile
 
+tasks:
+  - before: sdk install mvnd
+    init: mvnd verify -DskipTests
+
 ports:
   - port: 3000
     visibility: public

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

aws-cloudwatch-project/pom.xml

@@ -18,7 +18,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>
         <spring-cloud-aws.version>3.0.3</spring-cloud-aws.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
         <commons-io.version>2.15.0</commons-io.version>
@@ -251,7 +251,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.15.0</version>
+                            <version>1.18.1</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>

aws-cloudwatch-project/src/main/java/com/example/awsspring/config/logging/LoggingAspect.java

@@ -26,16 +26,20 @@ public LoggingAspect(Environment env) {
     }
 
     @Pointcut(
-            "within(@org.springframework.stereotype.Repository *)"
-                    + " || within(@org.springframework.stereotype.Service *)"
-                    + " || within(@org.springframework.web.bind.annotation.RestController *)")
+            """
+            within(@org.springframework.stereotype.Repository *)\
+             || within(@org.springframework.stereotype.Service *)\
+             || within(@org.springframework.web.bind.annotation.RestController *)\
+            """)
     public void springBeanPointcut() {
         // pointcut definition
     }
 
     @Pointcut(
-            "@within(com.example.awsspring.config.logging.Loggable) || "
-                    + "@annotation(com.example.awsspring.config.logging.Loggable)")
+            """
+            @within(com.example.awsspring.config.logging.Loggable) || \
+            @annotation(com.example.awsspring.config.logging.Loggable)\
+            """)
     public void applicationPackagePointcut() {
         // pointcut definition
     }

aws-cloudwatch-project/src/test/java/com/example/awsspring/web/controllers/CustomerControllerIT.java

@@ -47,7 +47,7 @@ void shouldFetchAllCustomers() throws Exception {
 
     @Test
     void shouldFindCustomerById() throws Exception {
-        Customer customer = customerList.get(0);
+        Customer customer = customerList.getFirst();
         Long customerId = customer.getId();
 
         this.mockMvc
@@ -90,7 +90,7 @@ void shouldReturn400WhenCreateNewCustomerWithoutText() throws Exception {
 
     @Test
     void shouldUpdateCustomer() throws Exception {
-        Customer customer = customerList.get(0);
+        Customer customer = customerList.getFirst();
         customer.setText("Updated Customer");
 
         this.mockMvc
@@ -104,7 +104,7 @@ void shouldUpdateCustomer() throws Exception {
 
     @Test
     void shouldDeleteCustomer() throws Exception {
-        Customer customer = customerList.get(0);
+        Customer customer = customerList.getFirst();
 
         this.mockMvc
                 .perform(delete("/api/customers/{id}", customer.getId()))

aws-dynamodb-project/pom.xml

@@ -18,7 +18,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>
         <spring-cloud.version>2022.0.4</spring-cloud.version>
         <spring-cloud-aws.version>3.0.3</spring-cloud-aws.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
@@ -38,19 +38,24 @@
         <junit.itReportFolder>${project.testresult.directory}/integrationTest</junit.itReportFolder>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
@@ -245,7 +250,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.17.0</version>
+                            <version>1.18.1</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                         <formatAnnotations />

aws-dynamodb-project/src/main/java/com/learning/awsspring/config/logging/LoggingAspect.java

@@ -26,16 +26,20 @@ public LoggingAspect(Environment env) {
     }
 
     @Pointcut(
-            "within(@org.springframework.stereotype.Repository *)"
-                    + " || within(@org.springframework.stereotype.Service *)"
-                    + " || within(@org.springframework.web.bind.annotation.RestController *)")
+            """
+            within(@org.springframework.stereotype.Repository *)\
+             || within(@org.springframework.stereotype.Service *)\
+             || within(@org.springframework.web.bind.annotation.RestController *)\
+            """)
     public void springBeanPointcut() {
         // pointcut definition
     }
 
     @Pointcut(
-            "@within(com.learning.awsspring.config.logging.Loggable) || "
-                    + "@annotation(com.learning.awsspring.config.logging.Loggable)")
+            """
+            @within(com.learning.awsspring.config.logging.Loggable) || \
+            @annotation(com.learning.awsspring.config.logging.Loggable)\
+            """)
     public void applicationPackagePointcut() {
         // pointcut definition
     }

aws-dynamodb-project/src/test/java/com/learning/awsspring/web/controllers/CustomerControllerIT.java

@@ -49,7 +49,7 @@ void shouldFetchAllCustomers() throws Exception {
 
     @Test
     void shouldFindCustomerById() throws Exception {
-        Customer customer = customerList.get(0);
+        Customer customer = customerList.getFirst();
         UUID customerId = customer.getId();
 
         this.mockMvc
@@ -76,7 +76,7 @@ void shouldCreateNewCustomer() throws Exception {
 
     @Test
     void shouldDeleteCustomer() throws Exception {
-        Customer customer = customerList.get(0);
+        Customer customer = customerList.getFirst();
 
         this.mockMvc
                 .perform(