Skip to content

Commit

Permalink
Upgrade to Java 21
Browse files Browse the repository at this point in the history
- Upgrade project and development environment to Java 21

Signed-off-by: Wade Barnes <wade@neoterictech.ca>
  • Loading branch information
WadeBarnes committed Jun 6, 2024
1 parent 75b418a commit a434394
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{
"name": "Java",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
// "image": "mcr.microsoft.com/devcontainers/java:1-21-bookworm",
"image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
"image": "mcr.microsoft.com/devcontainers/java:1-21-bookworm",
// "image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
// "image": "mcr.microsoft.com/devcontainers/java:1-11-bookworm",

"features": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/automationtestapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
echo "Release Git Sha: ${{env.gitsha}}"
# Set up JDK build environment
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

# Runs build steps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
uses: actions/checkout@v4

# Set up JDK build environment
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

# Get Code Climate binary
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
echo "Release Git Sha: ${{env.gitsha}}"
# Set up JDK build environment
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21
distribution: 'temurin'

# Runs build steps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
uses: actions/checkout@v4

# Set up JDK build environment
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

# Runs build steps
Expand Down
2 changes: 1 addition & 1 deletion AutomatedTest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine

WORKDIR /app
RUN chgrp -R 0 /app && \
Expand Down
4 changes: 2 additions & 2 deletions AutomatedTest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine

COPY ./target/cdds-application.jar cdds-application.jar

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CDDS webMethods Retirement Project
* Docker
* Docker Compose
* Maven
* Java 17
* Java 21
* Lombok

### Application Endpoints
Expand All @@ -37,7 +37,7 @@ SPLUNK_INDEX: The index that the application will push logs to. The index must b
before they can be pushed to.

### Building the Application
1) Set intellij to use java 17 for the project modals and sdk
1) Set intellij to use java 21 for the project modals and sdk
2) Run ``mvn compile``
3) Make sure ```target/generated-sources/xjc``` folder in included in module path

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<description>jag-cdds</description>
<properties>
<default-package>ca.bc.gov.open.cdds</default-package>
<java.version>17</java.version>
<java.version>21</java.version>
<log4j2.version>2.17.1</log4j2.version>
</properties>

Expand Down

0 comments on commit a434394

Please sign in to comment.