Updated Lambda runtime from Java8 to Java17 (#23)

aws-cloudformation · Feb 20, 2024 · 8f25c9d · 8f25c9d
1 parent 9269e53
commit 8f25c9d
Show file tree

Hide file tree

Showing 21 changed files with 130 additions and 130 deletions.
diff --git a/.github/workflows/java-ci-with-maven.yml b/.github/workflows/java-ci-with-maven.yml
@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 17
     - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:

diff --git a/aws-b2bi-capability/.rpdk-config b/aws-b2bi-capability/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::B2BI::Capability",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java17",
     "entrypoint": "software.amazon.b2bi.capability.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.b2bi.capability.HandlerWrapper::testEntrypoint",
     "settings": {

diff --git a/aws-b2bi-capability/pom.xml b/aws-b2bi-capability/pom.xml
@@ -12,8 +12,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <kotlin.version>1.8.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -31,25 +31,31 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>b2bi</artifactId>
-            <version>2.21.32</version>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sdk-core</artifactId>
-            <version>2.20.66</version>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/aws-core -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-core</artifactId>
-            <version>2.20.69</version>
+            <version>2.24.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/utils -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils</artifactId>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
@@ -113,7 +119,7 @@
                 <plugin>
                     <groupId>org.projectlombok</groupId>
                     <artifactId>lombok-maven-plugin</artifactId>
-                    <version>1.18.20.0</version>
+                    <version>1.18.22</version>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/aws-b2bi-capability/src/test/kotlin/software/amazon/b2bi/capability/ListHandlerTest.kt b/aws-b2bi-capability/src/test/kotlin/software/amazon/b2bi/capability/ListHandlerTest.kt
@@ -3,7 +3,6 @@ package software.amazon.b2bi.capability
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockkObject
 import io.mockk.unmockkAll
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterAll
@@ -12,7 +11,6 @@ import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import software.amazon.awssdk.services.b2bi.B2BiClient
 import software.amazon.awssdk.services.b2bi.model.ListCapabilitiesRequest
 import software.amazon.awssdk.services.b2bi.model.ListCapabilitiesResponse
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy
@@ -28,15 +26,11 @@ class ListHandlerTest {
     private lateinit var proxy: AmazonWebServicesClientProxy
     @MockK
     private lateinit var logger: Logger
-    @MockK
-    private lateinit var b2BiClient: B2BiClient
-    private var handler = ListHandler()
+    private val handler = ListHandler()
 
     @BeforeAll
     fun setupOnce() {
         MockKAnnotations.init(this, relaxed = true)
-        mockkObject(ClientBuilder)
-        every { ClientBuilder.getClient() } returns b2BiClient
     }
 
     @AfterAll
@@ -94,4 +88,4 @@ class ListHandlerTest {
             )
         )
     }
-}
+}
diff --git a/aws-b2bi-capability/template.yml b/aws-b2bi-capability/template.yml
@@ -12,13 +12,13 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.b2bi.capability.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java17
       CodeUri: ./target/aws-b2bi-capability-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.b2bi.capability.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java17
       CodeUri: ./target/aws-b2bi-capability-handler-1.0-SNAPSHOT.jar
 
diff --git a/aws-b2bi-partnership/.rpdk-config b/aws-b2bi-partnership/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::B2BI::Partnership",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java17",
     "entrypoint": "software.amazon.b2bi.partnership.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.b2bi.partnership.HandlerWrapper::testEntrypoint",
     "settings": {

diff --git a/aws-b2bi-partnership/pom.xml b/aws-b2bi-partnership/pom.xml
@@ -12,8 +12,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <kotlin.version>1.8.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -31,25 +31,31 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>b2bi</artifactId>
-            <version>2.21.32</version>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sdk-core</artifactId>
-            <version>2.20.66</version>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/aws-core -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-core</artifactId>
-            <version>2.20.69</version>
+            <version>2.24.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/utils -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils</artifactId>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
@@ -113,7 +119,7 @@
                 <plugin>
                     <groupId>org.projectlombok</groupId>
                     <artifactId>lombok-maven-plugin</artifactId>
-                    <version>1.18.20.0</version>
+                    <version>1.18.22</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -371,4 +377,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/aws-b2bi-partnership/src/test/kotlin/software/amazon/b2bi/partnership/ListHandlerTest.kt b/aws-b2bi-partnership/src/test/kotlin/software/amazon/b2bi/partnership/ListHandlerTest.kt
@@ -3,7 +3,6 @@ package software.amazon.b2bi.partnership
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockkObject
 import io.mockk.unmockkAll
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterAll
@@ -12,7 +11,6 @@ import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import software.amazon.awssdk.services.b2bi.B2BiClient
 import software.amazon.awssdk.services.b2bi.model.ListPartnershipsRequest
 import software.amazon.awssdk.services.b2bi.model.ListPartnershipsResponse
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy
@@ -28,15 +26,11 @@ class ListHandlerTest {
     private lateinit var proxy: AmazonWebServicesClientProxy
     @MockK
     private lateinit var logger: Logger
-    @MockK
-    private lateinit var b2BiClient: B2BiClient
-    private var handler = ListHandler()
+    private val handler = ListHandler()
 
     @BeforeAll
     fun setupOnce() {
         MockKAnnotations.init(this, relaxed = true)
-        mockkObject(ClientBuilder)
-        every { ClientBuilder.getClient() } returns b2BiClient
     }
 
     @AfterAll
@@ -94,4 +88,4 @@ class ListHandlerTest {
             )
         )
     }
-}
+}
diff --git a/aws-b2bi-partnership/template.yml b/aws-b2bi-partnership/template.yml
@@ -12,13 +12,13 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.b2bi.partnership.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java17
       CodeUri: ./target/aws-b2bi-partnership-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.b2bi.partnership.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java17
       CodeUri: ./target/aws-b2bi-partnership-handler-1.0-SNAPSHOT.jar
 
diff --git a/aws-b2bi-profile/.rpdk-config b/aws-b2bi-profile/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::B2BI::Profile",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java17",
     "entrypoint": "software.amazon.b2bi.profile.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.b2bi.profile.HandlerWrapper::testEntrypoint",
     "settings": {

diff --git a/aws-b2bi-profile/pom.xml b/aws-b2bi-profile/pom.xml
@@ -12,8 +12,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <kotlin.version>1.8.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -31,25 +31,31 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>b2bi</artifactId>
-            <version>2.21.32</version>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/sdk-core -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sdk-core</artifactId>
-            <version>2.20.66</version>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/aws-core -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-core</artifactId>
-            <version>2.20.69</version>
+            <version>2.24.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/utils -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils</artifactId>
+            <version>2.24.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
@@ -113,7 +119,7 @@
                 <plugin>
                     <groupId>org.projectlombok</groupId>
                     <artifactId>lombok-maven-plugin</artifactId>
-                    <version>1.18.20.0</version>
+                    <version>1.18.22</version>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/aws-b2bi-profile/src/test/kotlin/software/amazon/b2bi/profile/ListHandlerTest.kt b/aws-b2bi-profile/src/test/kotlin/software/amazon/b2bi/profile/ListHandlerTest.kt
@@ -3,7 +3,6 @@ package software.amazon.b2bi.profile
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockkObject
 import io.mockk.unmockkAll
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterAll
@@ -12,7 +11,6 @@ import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import software.amazon.awssdk.services.b2bi.B2BiClient
 import software.amazon.awssdk.services.b2bi.model.ListProfilesRequest
 import software.amazon.awssdk.services.b2bi.model.ListProfilesResponse
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy
@@ -28,15 +26,11 @@ class ListHandlerTest {
     private lateinit var proxy: AmazonWebServicesClientProxy
     @MockK
     private lateinit var logger: Logger
-    @MockK
-    private lateinit var b2BiClient: B2BiClient
-    private var handler = ListHandler()
+    private val handler = ListHandler()
 
     @BeforeAll
     fun setupOnce() {
         MockKAnnotations.init(this, relaxed = true)
-        mockkObject(ClientBuilder)
-        every { ClientBuilder.getClient() } returns b2BiClient
     }
 
     @AfterAll

diff --git a/aws-b2bi-profile/template.yml b/aws-b2bi-profile/template.yml
@@ -12,13 +12,13 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.b2bi.profile.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java17
       CodeUri: ./target/aws-b2bi-profile-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.b2bi.profile.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java17
       CodeUri: ./target/aws-b2bi-profile-handler-1.0-SNAPSHOT.jar
 
diff --git a/aws-b2bi-transformer/.rpdk-config b/aws-b2bi-transformer/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::B2BI::Transformer",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java17",
     "entrypoint": "software.amazon.b2bi.transformer.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.b2bi.transformer.HandlerWrapper::testEntrypoint",
     "settings": {