From 7a8f1a19bcc6e523b387ed5acd2bbd3124f4c343 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 6 Aug 2024 09:39:57 +0200 Subject: [PATCH 1/6] Set Maven compiler to Java 21 JIRA: LIGHTY-311 Signed-off-by: tobias.pobocik --- lighty-core/lighty-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lighty-core/lighty-parent/pom.xml b/lighty-core/lighty-parent/pom.xml index 324122805f..5c793d8275 100644 --- a/lighty-core/lighty-parent/pom.xml +++ b/lighty-core/lighty-parent/pom.xml @@ -28,7 +28,7 @@ - 17 + 21 2.0.13 2.23.1 From 9af25de2dd7f98eed0921a29026970aabf82b583 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 6 Aug 2024 09:40:42 +0200 Subject: [PATCH 2/6] Use java 21 in GH workflows JIRA: LIGHTY-311 Signed-off-by: tobias.pobocik --- .github/workflows/build.yml | 6 +++--- .github/workflows/publish-docker-helm.yml | 4 ++-- .github/workflows/publish-rcgnmi.yml | 4 ++-- .github/workflows/publish-rnc.yml | 4 ++-- .github/workflows/test-lighty-app.yml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cd96bc23d..88b911b59f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,10 @@ 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: Cache SonarCloud packages uses: actions/cache@v1 @@ -43,7 +43,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 diff --git a/.github/workflows/publish-docker-helm.yml b/.github/workflows/publish-docker-helm.yml index b31e77f5bc..71180719ea 100644 --- a/.github/workflows/publish-docker-helm.yml +++ b/.github/workflows/publish-docker-helm.yml @@ -49,10 +49,10 @@ jobs: uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.checkout-ref }} - - 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: Cache Maven packages uses: actions/cache@v1 diff --git a/.github/workflows/publish-rcgnmi.yml b/.github/workflows/publish-rcgnmi.yml index f695772300..8a19f11020 100644 --- a/.github/workflows/publish-rcgnmi.yml +++ b/.github/workflows/publish-rcgnmi.yml @@ -37,10 +37,10 @@ jobs: uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.checkout-ref }} - - 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: Cache Maven packages uses: actions/cache@v1 diff --git a/.github/workflows/publish-rnc.yml b/.github/workflows/publish-rnc.yml index 334e0bc38f..9ff3dfe587 100644 --- a/.github/workflows/publish-rnc.yml +++ b/.github/workflows/publish-rnc.yml @@ -37,10 +37,10 @@ jobs: uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.checkout-ref }} - - 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: Cache Maven packages uses: actions/cache@v1 diff --git a/.github/workflows/test-lighty-app.yml b/.github/workflows/test-lighty-app.yml index e26c4177a5..4375d980d1 100644 --- a/.github/workflows/test-lighty-app.yml +++ b/.github/workflows/test-lighty-app.yml @@ -22,10 +22,10 @@ jobs: steps: - name: Clone Repository 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: Cache Maven packages uses: actions/cache@v1 From bba751b09a3dfcb855ebc398abb5a849f095249e Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 6 Aug 2024 09:41:12 +0200 Subject: [PATCH 3/6] Set lift and lgtm to Java 21 JIRA: LIGHTY-311 Signed-off-by: tobias.pobocik --- .lift.toml | 2 +- lgtm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.lift.toml b/.lift.toml index 65f893c997..a10af0592d 100644 --- a/.lift.toml +++ b/.lift.toml @@ -1,4 +1,4 @@ build = "maven" -jdkVersion = "17" +jdkVersion = "21" summaryComments = true diff --git a/lgtm.yml b/lgtm.yml index 1ac15329b5..5c9de2a38f 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -1,4 +1,4 @@ extraction: java: index: - java_version: 17 \ No newline at end of file + java_version: 21 \ No newline at end of file From 47fd66e323b1251e4198614ae4c5372958d9c33e Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 6 Aug 2024 09:41:48 +0200 Subject: [PATCH 4/6] Use Java 21 in RNC and RcGNMI docker JIRA: LIGHTY-311 Signed-off-by: tobias.pobocik --- .../lighty-rcgnmi-app-docker/src/main/docker/Dockerfile | 2 +- .../lighty-rnc-app-docker/src/main/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-docker/src/main/docker/Dockerfile b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-docker/src/main/docker/Dockerfile index f8d40b9dd5..da927ed4d9 100644 --- a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-docker/src/main/docker/Dockerfile +++ b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-docker/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre-alpine +FROM eclipse-temurin:21-jre-alpine WORKDIR /lighty-rcgnmi diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/src/main/docker/Dockerfile b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/src/main/docker/Dockerfile index 647137b30a..1a9127e39b 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/src/main/docker/Dockerfile +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre-alpine +FROM eclipse-temurin:21-jre-alpine WORKDIR /lighty-rnc From 9994d11703fb9145229946bbf9dc4ea557474dd5 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 6 Aug 2024 09:42:30 +0200 Subject: [PATCH 5/6] Update start-controller script to required Java 21 JIRA: LIGHTY-311 Signed-off-by: tobias.pobocik Signed-off-by: Matej Sramcik --- .../start-script/src/main/resources/start-controller.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lighty-resources/start-script/src/main/resources/start-controller.sh b/lighty-resources/start-script/src/main/resources/start-controller.sh index 9f8cd6ae07..0b717ca270 100755 --- a/lighty-resources/start-script/src/main/resources/start-controller.sh +++ b/lighty-resources/start-script/src/main/resources/start-controller.sh @@ -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/temurin-21-jdk-amd64 # If JAVA_HOME is not set, try to find it using java itself if [ -z ${JAVA_HOME} ]; then From 96fdb8b60235e42b217cfa49945bb2d9c29de922 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 6 Aug 2024 09:45:00 +0200 Subject: [PATCH 6/6] Update Java version in README files JIRA: LIGHTY-311 Signed-off-by: tobias.pobocik Signed-off-by: Matej Sramcik --- README.md | 2 +- lighty-applications/lighty-rcgnmi-app-aggregator/README.md | 2 +- lighty-applications/lighty-rnc-app-aggregator/README.md | 2 +- lighty-examples/lighty-bgp-community-restconf-app/README.md | 2 +- lighty-examples/lighty-gnmi-community-restconf-app/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d52a6e8d7e..f32b5c1401 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ _This branch maintains compatibility with __OpenDaylight 2024-09 Scandium,__ rel ## Build & Install In order to build and install lighty.io artifacts locally, follow the steps below: -1. __Install JDK__ - make sure [JDK 17](https://openjdk.java.net/projects/jdk/17/) is installed +1. __Install JDK__ - make sure [JDK 21](https://openjdk.java.net/projects/jdk/21/) is installed (For example: https://adoptium.net/temurin/releases/) 2. __Install maven__ - make sure you have maven 3.8.5 or later installed 3. __Setup maven__ - make sure you have the proper [settings.xml](https://github.com/opendaylight/odlparent/blob/master/settings.xml) in your ```~/.m2``` directory 4. __Build & Install locally__ - by running command: ``mvn clean install -DskipTests`` diff --git a/lighty-applications/lighty-rcgnmi-app-aggregator/README.md b/lighty-applications/lighty-rcgnmi-app-aggregator/README.md index 20755eea6f..f3af5b7ed2 100644 --- a/lighty-applications/lighty-rcgnmi-app-aggregator/README.md +++ b/lighty-applications/lighty-rcgnmi-app-aggregator/README.md @@ -11,7 +11,7 @@ A lighty.io application, which starts and wires the following components: ## Prerequisites In order to build & start the RCgNMI application locally, you need: -* Java 17 (or later) +* Java 21 (or later) * Maven 3.8.5 (or later) ## Build & Start diff --git a/lighty-applications/lighty-rnc-app-aggregator/README.md b/lighty-applications/lighty-rnc-app-aggregator/README.md index 934dfdf208..7bdd39552a 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/README.md +++ b/lighty-applications/lighty-rnc-app-aggregator/README.md @@ -18,7 +18,7 @@ Most important lighty.io components used are: ## Prerequisites In order to build and start the lighty.io RNC application locally, you need: -* Java 17 or later +* Java 21 or later * Maven 3.8.5 or later * (Optional) Docker for creating and running Docker images diff --git a/lighty-examples/lighty-bgp-community-restconf-app/README.md b/lighty-examples/lighty-bgp-community-restconf-app/README.md index 51cd65aee5..23d49f8255 100644 --- a/lighty-examples/lighty-bgp-community-restconf-app/README.md +++ b/lighty-examples/lighty-bgp-community-restconf-app/README.md @@ -8,7 +8,7 @@ Application starts the following components: ## Prerequisites In order to build and start the application locally, you need: -* Java 17 or later +* Java 21 or later * Maven 3.8.5 or later ## Build diff --git a/lighty-examples/lighty-gnmi-community-restconf-app/README.md b/lighty-examples/lighty-gnmi-community-restconf-app/README.md index 7561a9a206..05cdf49673 100644 --- a/lighty-examples/lighty-gnmi-community-restconf-app/README.md +++ b/lighty-examples/lighty-gnmi-community-restconf-app/README.md @@ -21,7 +21,7 @@ This application starts: ## Prerequisites In order to build and start and run this example, the lighty.io gNMI/RESTCONF application locally, you need: -* Java 17 or later +* Java 21 or later * Maven 3.8.5 or later * Postman v7.36.5. or later * Linux-based system with bash