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

Complete Java 21 migration #2005

Merged
merged 4 commits into from
Oct 18, 2024
Merged

Complete Java 21 migration #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67f747f
Use eclipse-temurin-21
ihrasko Oct 18, 2024
c377e01
Set Spring's maven.compiler.release to 21
ihrasko Oct 18, 2024
79ea518
Use Java 21 in start-controller.sh
ihrasko Oct 18, 2024
269cabb
Set log4j-config maven.compiler.release to 21
ihrasko Oct 18, 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/lighty-rnc-app/simulator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ RUN apk add git
WORKDIR /netconf-simulator
RUN git clone https://github.com/PANTHEONtech/lighty-netconf-simulator.git -b $SIMULATOR_VERSION

FROM maven:3.9-eclipse-temurin-17-alpine as build
FROM maven:3.9-eclipse-temurin-21-alpine as build
ARG SIMULATOR_VERSION
WORKDIR /lighty-netconf-simulator
COPY --from=clone /netconf-simulator/lighty-netconf-simulator /lighty-netconf-simulator
RUN mvn -B install -DskipTests

FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine
ARG SIMULATOR_VERSION
WORKDIR /lighty-netconf-simulator
COPY --from=build /lighty-netconf-simulator/examples/devices/lighty-network-topology-device/target/ /lighty-netconf-simulator/target
Expand Down
2 changes: 1 addition & 1 deletion lighty-examples/lighty-controller-springboot-netconf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.release>21</maven.compiler.release>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion lighty-resources/log4j2-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</description>

<properties>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.release>21</maven.compiler.release>
</properties>

<profiles>
Expand Down
6 changes: 3 additions & 3 deletions lighty-resources/start-script/src/main/resources/start-controller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ if [ -z ${JAVA_HOME} ]; then
JAVA_HOME=`java -XshowSettings:properties -version 2>&1 > /dev/null | grep 'java.home' | sed -e 's/^.*java.home = \(.*\)$/\1/'`
fi;

# Make sure we are using Java 17+
# Make sure we are using Java 21+
JAVA_VERSION=`${JAVA_HOME}/bin/java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1`
if [ -z ${JAVA_VERSION} ] || [ ${JAVA_VERSION} -lt 17 ]; then
echo "Java 17+ is required to run this application!"
if [ -z ${JAVA_VERSION} ] || [ ${JAVA_VERSION} -lt 21 ]; then
echo "Java 21+ is required to run this application!"
exit -1
fi;

Expand Down
Loading