Skip to content

Commit

Permalink
Attempt switch to Java 17 to remediate issues with new versions of li…
Browse files Browse the repository at this point in the history
…brarires
  • Loading branch information
alex-bcgov committed Sep 12, 2024
1 parent 2dfed1c commit 4b99b74
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code-climate-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ jobs:
if: env.GIT_BRANCH == 'refs/heads/master'

# Setup Java Environment
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: '17'
- uses: actions/cache@v1
with:
path: ~/.m2/repository
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 @@ -18,10 +18,10 @@ jobs:
uses: actions/checkout@v2

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

# Runs build steps
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:8-jre-jammy
FROM eclipse-temurin:17-jre-jammy

COPY ./target/bcparis-service-1.3.2.jar bcparis-service-1.3.2.jar

Expand Down
2 changes: 1 addition & 1 deletion openshift/applications/buildConfigs/bc-paris-api-bc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ objects:
sourceStrategy:
from:
kind: ImageStreamTag
name: 'java:8'
name: 'java:17'
namespace: openshift
type: Source
successfulBuildsHistoryLimit: 5
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</sonar.exclusions>

<!-- ========== Enforce ========== -->
<java.version>1.8</java.version>
<java.version>17</java.version>
<!-- 3.3.9 is the most recent version supported by Red Hat Jenkins slave
images. We can't go to 3.5 -->
<maven.version>3.8.5</maven.version>
Expand Down Expand Up @@ -248,7 +248,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>6.3.3</version>
<version>${spring-security.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -403,8 +403,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit 4b99b74

Please sign in to comment.