Skip to content
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

Jump to bottom

Update to JDK 21 #192

Merged
merged 3 commits into from
Oct 11, 2024
Merged

Update to JDK 21 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa9329a
Update to JDK 21
ssylver93 Oct 11, 2024
59f0daf
Update to JDK 21
ssylver93 Oct 11, 2024
149c9b0
Merge branch 'bcgov:main' into feature/WFPREV-61
ssylver93 Oct 11, 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/mvn-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
with:
ref: ${{ inputs.BRANCH }}

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

- name: Add .npmrc file
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarscan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
fetch-depth: 0
submodules: 'recursive'

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

- name: Cache Maven packages
Expand Down
4 changes: 2 additions & 2 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-source-version>17</java-source-version>
<java-target-version>17</java-target-version>
<java-source-version>21</java-source-version>
<java-target-version>21</java-target-version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion client/wfprev-war/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use an official Tomcat image with JDK 8
FROM tomcat:9.0.91-jdk17
FROM tomcat:9.0.91-jdk21
#Install at very top layer to ease caching issues for devs
RUN apt-get -y update &&\
apt-get install -y unzip
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</modules>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<!-- plugins -->
<sonar.version>4.0.0.4121</sonar.version>
<jacoco.version>0.8.11</jacoco.version>
Expand Down
2 changes: 1 addition & 1 deletion server/wfprev-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use an official Tomcat image as a base image
FROM tomcat:10.1-jdk17-corretto
FROM tomcat:10.1-jdk21

# Remove the default webapps to avoid conflicts
RUN rm -rf /usr/local/tomcat/webapps/*
Expand Down
2 changes: 1 addition & 1 deletion server/wfprev-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<url/>
</scm>
<properties>
<java.version>17</java.version>
<java.version>21</java.version>
</properties>
<dependencies>
<dependency>
Expand Down
Loading