Skip to content

Upgrade to Java 21 #305

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
ORybak5 merged 6 commits into from
Jan 6, 2025
Merged

Upgrade to Java 21 #305

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
366e61e
upgrade to java 21
ORybak5 Jan 2, 2025
afd79bb
adding a missing jacoco report dependency
ORybak5 Jan 2, 2025
ced31ba
Merge branch 'master' into java-21-upgrade
ORybak5 Jan 3, 2025
644427f
upgrading docker container to use Java 21
ORybak5 Jan 6, 2025
154d598
Merge branch 'java-21-upgrade' of https://github.com/NHSDigital/integ…
ORybak5 Jan 6, 2025
d13b7ad
downgrading to gradle 8.8 version to be in line with other places whe…
ORybak5 Jan 6, 2025
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
1 change: 0 additions & 1 deletion docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.8'
services:
integration-adaptor-111:
build:
Expand Down
4 changes: 2 additions & 2 deletions docker/service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM gradle:8.8-jdk17 AS build
FROM gradle:8.11.0-jdk21-jammy AS build
COPY --chown=gradle:gradle service /home/gradle/service

WORKDIR /home/gradle/service

RUN ./gradlew --build-cache bootJar

FROM eclipse-temurin:17-jre-jammy
FROM eclipse-temurin:21-jre-jammy

EXPOSE 8081

Expand Down
2 changes: 1 addition & 1 deletion nhs-england-developer-information.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
> The audience of this documentation is designed for NHS England developers.

## Pre requisites for running the Adaptor:
1. JDK 17
1. JDK 21
2. Docker

## How to run service:
Expand Down
5 changes: 5 additions & 0 deletions service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ apply plugin: 'org.springframework.boot'
apply plugin: 'checkstyle'
apply plugin: "com.github.spotbugs"

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
Comment on lines +16 to +19
Copy link
Contributor

@adrianclay adrianclay Jan 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have to explain what these do. They weren't there before, so I can only assume they're important?

Copy link
Contributor Author

@ORybak5 ORybak5 Jan 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just to make sure that we are using Java 21 in case when there are any other Java versions installed on any env where this project is run. It is just to avoid ambiguity


repositories {
mavenCentral()
flatDir {
Expand Down
Loading