Skip to content

Commit ae56c9d

Browse files
saieshwarmsaieshwarm
authored
Upgrade java version from java 8 to java 17 (#432)
* Upgrade java version from java 8 to java 17 * Upgrade java compiler from 1.8 to 17 * Update pr-ci.yaml * Add java17 runtime docker * Update jacoco in Generated pom.xml to 0.8.10
1 parent 5b354cf commit ae56c9d

File tree

7 files changed

+80
-15
lines changed

7 files changed

+80
-15
lines changed

‎.github/workflows/pr-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
AWS_REGION: us-east-1
1515
strategy:
1616
matrix:
17-
python: ["3.8", "3.9", "3.10", "3.11"]
18-
java: [8, 11]
17+
python: ["3.9", "3.10", "3.11"]
18+
java: [17]
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v2

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@
3333
<url>https://github.com/aws-cloudformation/aws-cloudformation-rpdk-java-plugin</url>
3434
</scm>
3535
<properties>
36-
<maven.compiler.source>1.8</maven.compiler.source>
37-
<maven.compiler.target>1.8</maven.compiler.target>
36+
<maven.compiler.source>17</maven.compiler.source>
37+
<maven.compiler.target>17</maven.compiler.target>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4040
<awssdk.version>2.19.0</awssdk.version>
4141
<checkstyle.version>8.36.2</checkstyle.version>
4242
<commons-io.version>2.8.0</commons-io.version>
4343
<jackson.version>2.14.1</jackson.version>
4444
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
45-
<mockito.version>3.6.0</mockito.version>
46-
<spotbugs.version>4.1.4</spotbugs.version>
45+
<mockito.version>3.12.4</mockito.version>
46+
<spotbugs.version>4.5.3.0</spotbugs.version>
4747
<spotless.version>2.28.0</spotless.version>
4848
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
4949
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.projectlombok</groupId>
107107
<artifactId>lombok</artifactId>
108-
<version>1.18.8</version>
108+
<version>1.18.24</version>
109109
<scope>provided</scope>
110110
</dependency>
111111
<!-- https://mvnrepository.com/artifact/org.json/json -->
@@ -337,7 +337,7 @@
337337
<plugin>
338338
<groupId>org.jacoco</groupId>
339339
<artifactId>jacoco-maven-plugin</artifactId>
340-
<version>0.8.4</version>
340+
<version>0.8.10</version>
341341
<executions>
342342
<execution>
343343
<goals>

‎python/rpdk/java/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
22

3-
__version__ = "2.0.18"
3+
__version__ = "2.1.0"
44

55
logging.getLogger(__name__).addHandler(logging.NullHandler())

‎python/rpdk/java/codegen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class InvalidMavenPOMError(SysExitRecommendedError):
7070

7171
class JavaLanguagePlugin(LanguagePlugin):
7272
MODULE_NAME = __name__
73-
RUNTIME = "java8"
73+
RUNTIME = "java17"
7474
HOOK_ENTRY_POINT = "{}.HookHandlerWrapper::handleRequest"
7575
HOOK_TEST_ENTRY_POINT = "{}.HookHandlerWrapper::testEntrypoint"
7676
HOOK_EXECUTABLE_ENTRY_POINT = "{}.HookHandlerWrapperExecutable"

‎python/rpdk/java/data/build-image-src/Dockerfile-java8 renamed to ‎python/rpdk/java/data/build-image-src/Dockerfile-java17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:8-alpine
1+
FROM openjdk:17-alpine
22
ARG executable_name
33
ADD ${executable_name} handler.jar
44
ENTRYPOINT ["java", "-Xmx512M", "-cp", "handler.jar"]

‎python/rpdk/java/templates/init/shared/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<packaging>jar</packaging>
1313

1414
<properties>
15-
<maven.compiler.source>1.8</maven.compiler.source>
16-
<maven.compiler.target>1.8</maven.compiler.target>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1919
<cfn.generate.args/>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.projectlombok</groupId>
3232
<artifactId>lombok</artifactId>
33-
<version>1.18.4</version>
33+
<version>1.18.24</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.jacoco</groupId>
171171
<artifactId>jacoco-maven-plugin</artifactId>
172-
<version>0.8.4</version>
172+
<version>0.8.10</version>
173173
<configuration>
174174
<excludes>
175175
<exclude>{{ jacoco_maven_plugin_exclude_path_1 }}</exclude>

‎src/main/resources/com/amazonaws/cloudformation/spotbugs-suppressions.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,71 @@
3838
<Method name="setAdditionalProperty" />
3939
<Bug pattern="UPM_UNCALLED_PRIVATE_METHOD" />
4040
</Match>
41+
<Match>
42+
<Class name="software.amazon.cloudformation.AbstractWrapper" />
43+
<Bug pattern="MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR" />
44+
</Match>
45+
<Match>
46+
<Class name="software.amazon.cloudformation.HookAbstractWrapper" />
47+
<Bug pattern="MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR" />
48+
</Match>
49+
50+
51+
<Match>
52+
<Package name="software.amazon.cloudformation.scheduler.*"/>
53+
<Bug pattern="EI_EXPOSE_REP2"/>
54+
</Match>
55+
<Match>
56+
<Class name="software.amazon.cloudformation.encryption.KMSCipher"/>
57+
<Bug pattern="EI_EXPOSE_REP2"/>
58+
</Match>
59+
<Match>
60+
<Package name="software.amazon.cloudformation.*"/>
61+
<Bug pattern="EI_EXPOSE_REP2"/>
62+
</Match>
63+
<Match>
64+
<Package name="software.amazon.cloudformation.loggers.*"/>
65+
<Bug pattern="EI_EXPOSE_REP2"/>
66+
</Match>
67+
<Match>
68+
<Package name="software.amazon.cloudformation.proxy.*"/>
69+
<Bug pattern="EI_EXPOSE_REP2"/>
70+
</Match>
71+
<Match>
72+
<Package name="software.amazon.cloudformation.proxy.hook.*"/>
73+
<Bug pattern="EI_EXPOSE_REP2"/>
74+
</Match>
75+
<Match>
76+
<Package name="software.amazon.cloudformation.proxy.hook.targetmodel.*"/>
77+
<Bug pattern="EI_EXPOSE_REP2"/>
78+
</Match>
79+
80+
81+
82+
<Match>
83+
<Package name="software.amazon.cloudformation.scheduler.*"/>
84+
<Bug pattern="EI_EXPOSE_REP"/>
85+
</Match>
86+
<Match>
87+
<Package name="software.amazon.cloudformation.*"/>
88+
<Bug pattern="EI_EXPOSE_REP"/>
89+
</Match>
90+
<Match>
91+
<Package name="software.amazon.cloudformation.loggers.*"/>
92+
<Bug pattern="EI_EXPOSE_REP"/>
93+
</Match>
94+
<Match>
95+
<Package name="software.amazon.cloudformation.proxy.*"/>
96+
<Bug pattern="EI_EXPOSE_REP"/>
97+
</Match>
98+
<Match>
99+
<Package name="software.amazon.cloudformation.proxy.hook.*"/>
100+
<Bug pattern="EI_EXPOSE_REP"/>
101+
</Match>
102+
<Match>
103+
<Package name="software.amazon.cloudformation.proxy.hook.targetmodel.*"/>
104+
<Bug pattern="EI_EXPOSE_REP"/>
105+
</Match>
41106
</FindBugsFilter>
42107

43108
</FindBugsFilter>

0 commit comments

Comments
 (0)