diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d69865cdc..18889aca5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,11 +20,15 @@ jobs:
SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY}}
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 17
+ - name: Set up JDK 21
uses: actions/setup-java@v3
with:
- java-version: 17
+ java-version: 21
distribution: 'temurin'
+ - name: Set up Maven
+ uses: stCarolas/setup-maven@v5
+ with:
+ maven-version: 3.9.8
- name: Cache SonarCloud packages
uses: actions/cache@v1
if: ${{ env.SONAR_TOKEN != 0 }}
@@ -43,7 +47,7 @@ jobs:
- name: Maven test + SonarCloud
if: ${{ env.SONAR_TOKEN != 0 }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
- -Dsonar.java.source=17
+ -Dsonar.java.source=21
-Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
-Dsonar.organization=${{ env.SONAR_ORGANIZATION }}
-Dsonar.host.url=https://sonarcloud.io
@@ -51,7 +55,7 @@ jobs:
if: ${{ env.SONAR_TOKEN == 0 }}
run: mvn -B verify
- name: Upload surefire test results
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
with:
name: Surefire-Test-Results
path: ~/**/surefire-reports/**/*.txt
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0b7b61c1e..fdb0950dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
io.lighty.yang.validator.Main
true
+ 1.5.8
@@ -37,12 +38,12 @@
ch.qos.logback
logback-core
- 1.5.7
+ ${logback-version}
ch.qos.logback
logback-classic
- 1.5.7
+ ${logback-version}
diff --git a/src/main/assembly/resources/lyv b/src/main/assembly/resources/lyv
index b62ecfe0a..b59398d56 100755
--- a/src/main/assembly/resources/lyv
+++ b/src/main/assembly/resources/lyv
@@ -1,7 +1,7 @@
#!/bin/bash
-# Set JAVA_HOME to point to a specific Java 17+ JDK
-#export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+# Set JAVA_HOME to point to a specific Java 21+ JDK
+#export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
# If JAVA_HOME is not set, try to find it using java itself
if [ -z ${JAVA_HOME} ]; then
@@ -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;