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.

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

Use Java 21 #1920

Merged
merged 6 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-rcgnmi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-rnc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lighty-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .lift.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build = "maven"
jdkVersion = "17"
jdkVersion = "21"
summaryComments = true

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down
2 changes: 1 addition & 1 deletion lgtm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extraction:
java:
index:
java_version: 17
java_version: 21
2 changes: 1 addition & 1 deletion lighty-applications/lighty-rcgnmi-app-aggregator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine

WORKDIR /lighty-rcgnmi

Expand Down
2 changes: 1 addition & 1 deletion lighty-applications/lighty-rnc-app-aggregator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine

WORKDIR /lighty-rnc

Expand Down
2 changes: 1 addition & 1 deletion lighty-core/lighty-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</description>

<properties>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.release>21</maven.compiler.release>
<!-- Overrides Spring Boot slf4j and log4j2 dependency version -->
<slf4j.version>2.0.13</slf4j.version>
<log4j2.version>2.23.1</log4j2.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

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

/usr/lib/jvm/temurin-11-jdk-amd64

#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
Expand Down
Loading