Skip to content

Upgrade java version from java 8 to java 17 #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 9, 2024
Merged

Upgrade java version from java 8 to java 17 #432

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6f579d
Upgrade java version from java 8 to java 17
saieshwarm Dec 18, 2023
36d9926
Upgrade java compiler from 1.8 to 17
saieshwarm Dec 27, 2023
3c00425
Update pr-ci.yaml
saieshwarm Dec 28, 2023
dea5e92
Add java17 runtime docker
saieshwarm Jan 4, 2024
49145e5
Update jacoco in Generated pom.xml to 0.8.10
saieshwarm Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
<url>https://github.com/aws-cloudformation/aws-cloudformation-rpdk-java-plugin</url>
</scm>
<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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<awssdk.version>2.19.0</awssdk.version>
<checkstyle.version>8.36.2</checkstyle.version>
<commons-io.version>2.8.0</commons-io.version>
<jackson.version>2.14.1</jackson.version>
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<mockito.version>3.6.0</mockito.version>
<spotbugs.version>4.1.4</spotbugs.version>
<mockito.version>3.12.4</mockito.version>
<spotbugs.version>4.5.3.0</spotbugs.version>
<spotless.version>2.28.0</spotless.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
Expand Down Expand Up @@ -105,7 +105,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.8</version>
<version>1.18.24</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.json/json -->
Expand Down Expand Up @@ -337,7 +337,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
<version>0.8.10</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion python/rpdk/java/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import logging

__version__ = "2.0.18"
__version__ = "2.1.0"

logging.getLogger(__name__).addHandler(logging.NullHandler())
2 changes: 1 addition & 1 deletion python/rpdk/java/codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...ava/data/build-image-src/Dockerfile-java8 → ...va/data/build-image-src/Dockerfile-java17
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
6 changes: 3 additions & 3 deletions python/rpdk/java/templates/init/shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cfn.generate.args/>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<version>1.18.24</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
Expand Down
65 changes: 65 additions & 0 deletions src/main/resources/com/amazonaws/cloudformation/spotbugs-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,71 @@
<Method name="setAdditionalProperty" />
<Bug pattern="UPM_UNCALLED_PRIVATE_METHOD" />
</Match>
<Match>
<Class name="software.amazon.cloudformation.AbstractWrapper" />
<Bug pattern="MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR" />
</Match>
<Match>
<Class name="software.amazon.cloudformation.HookAbstractWrapper" />
<Bug pattern="MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR" />
</Match>


<Match>
<Package name="software.amazon.cloudformation.scheduler.*"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Class name="software.amazon.cloudformation.encryption.KMSCipher"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.*"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.loggers.*"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.proxy.*"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.proxy.hook.*"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.proxy.hook.targetmodel.*"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>



<Match>
<Package name="software.amazon.cloudformation.scheduler.*"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.*"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.loggers.*"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.proxy.*"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.proxy.hook.*"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Package name="software.amazon.cloudformation.proxy.hook.targetmodel.*"/>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
</FindBugsFilter>

</FindBugsFilter>