diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
index dcff742a..3120f93f 100644
--- a/.github/workflows/pr-ci.yaml
+++ b/.github/workflows/pr-ci.yaml
@@ -14,8 +14,8 @@ jobs:
AWS_REGION: us-east-1
strategy:
matrix:
- python: ["3.8", "3.9", "3.10", "3.11"]
- java: [8, 11]
+ python: ["3.9", "3.10", "3.11"]
+ java: [17]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
diff --git a/pom.xml b/pom.xml
index e12b1c81..f56bdf0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,8 @@
https://github.com/aws-cloudformation/aws-cloudformation-rpdk-java-plugin
- 1.8
- 1.8
+ 17
+ 17
UTF-8
UTF-8
2.19.0
@@ -42,8 +42,8 @@
2.8.0
2.14.1
3.1.1
- 3.6.0
- 4.1.4
+ 3.12.4
+ 4.5.3.0
2.28.0
3.2.0
3.2.1
@@ -105,7 +105,7 @@
org.projectlombok
lombok
- 1.18.8
+ 1.18.24
provided
@@ -337,7 +337,7 @@
org.jacoco
jacoco-maven-plugin
- 0.8.4
+ 0.8.10
diff --git a/python/rpdk/java/__init__.py b/python/rpdk/java/__init__.py
index 4523164a..2a5cd013 100644
--- a/python/rpdk/java/__init__.py
+++ b/python/rpdk/java/__init__.py
@@ -1,5 +1,5 @@
import logging
-__version__ = "2.0.18"
+__version__ = "2.1.0"
logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/python/rpdk/java/codegen.py b/python/rpdk/java/codegen.py
index fdef60e7..ee35a175 100644
--- a/python/rpdk/java/codegen.py
+++ b/python/rpdk/java/codegen.py
@@ -70,7 +70,7 @@ class InvalidMavenPOMError(SysExitRecommendedError):
class JavaLanguagePlugin(LanguagePlugin):
MODULE_NAME = __name__
- RUNTIME = "java8"
+ RUNTIME = "java17"
HOOK_ENTRY_POINT = "{}.HookHandlerWrapper::handleRequest"
HOOK_TEST_ENTRY_POINT = "{}.HookHandlerWrapper::testEntrypoint"
HOOK_EXECUTABLE_ENTRY_POINT = "{}.HookHandlerWrapperExecutable"
diff --git a/python/rpdk/java/data/build-image-src/Dockerfile-java8 b/python/rpdk/java/data/build-image-src/Dockerfile-java17
similarity index 82%
rename from python/rpdk/java/data/build-image-src/Dockerfile-java8
rename to python/rpdk/java/data/build-image-src/Dockerfile-java17
index 9ef02b34..f148fead 100644
--- a/python/rpdk/java/data/build-image-src/Dockerfile-java8
+++ b/python/rpdk/java/data/build-image-src/Dockerfile-java17
@@ -1,4 +1,4 @@
-FROM openjdk:8-alpine
+FROM openjdk:17-alpine
ARG executable_name
ADD ${executable_name} handler.jar
ENTRYPOINT ["java", "-Xmx512M", "-cp", "handler.jar"]
diff --git a/python/rpdk/java/templates/init/shared/pom.xml b/python/rpdk/java/templates/init/shared/pom.xml
index 4b84a9c0..849c960b 100644
--- a/python/rpdk/java/templates/init/shared/pom.xml
+++ b/python/rpdk/java/templates/init/shared/pom.xml
@@ -12,8 +12,8 @@
jar
- 1.8
- 1.8
+ 17
+ 17
UTF-8
UTF-8
@@ -30,7 +30,7 @@
org.projectlombok
lombok
- 1.18.4
+ 1.18.24
provided
@@ -169,7 +169,7 @@
org.jacoco
jacoco-maven-plugin
- 0.8.4
+ 0.8.10
{{ jacoco_maven_plugin_exclude_path_1 }}
diff --git a/src/main/resources/com/amazonaws/cloudformation/spotbugs-suppressions.xml b/src/main/resources/com/amazonaws/cloudformation/spotbugs-suppressions.xml
index bae1e2e6..7a0fdd61 100644
--- a/src/main/resources/com/amazonaws/cloudformation/spotbugs-suppressions.xml
+++ b/src/main/resources/com/amazonaws/cloudformation/spotbugs-suppressions.xml
@@ -38,6 +38,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+