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

Adopt 21.1.0 ODL MRI versions #2064

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
14883d2
[maven-release-plugin] prepare for next development iteration
Tobianas Oct 11, 2024
30939e7
Bump docs and scripts to 21.1.0-SNAPSHOT
Tobianas Oct 11, 2024
74b0eaf
Bump versions not managed by maven-release to 21.1.0-SNAPSHOT
Tobianas Oct 11, 2024
8bb73b7
Set scm.tag to HEAD
Tobianas Oct 11, 2024
7d6a690
Bump simulator to 21.0.0
Tobianas Oct 14, 2024
f558be6
Drop support for version 19
ihrasko Oct 17, 2024
78049cb
Bump JUnit to 5.11.2
Tobianas Oct 16, 2024
2ef08c3
Bump maven-{failsafe,surefire}-plugin to 3.5.1
Tobianas Oct 16, 2024
2621866
Bump maven-javadoc-plugin to 3.10.1
Tobianas Oct 15, 2024
d488549
Bump spotbugs-maven-plugin to 4.8.6.4
Tobianas Oct 15, 2024
9d6c30c
Use eclipse-temurin-21
ihrasko Oct 18, 2024
a266f10
Set Spring's maven.compiler.release to 21
ihrasko Oct 18, 2024
21c1735
Use Java 21 in start-controller.sh
ihrasko Oct 18, 2024
85ee304
Set log4j-config maven.compiler.release to 21
ihrasko Oct 18, 2024
6e18529
Bump docker-maven-plugin to 0.45.1
Tobianas Oct 18, 2024
ffabd7d
Bump grpc-netty to 1.67.1
snyk-bot Oct 21, 2024
6b70991
Bump jcasbin to 1.67.0
snyk-bot Oct 28, 2024
342a141
Bump spring to 3.3.5
ihrasko Oct 28, 2024
7c972bd
Bump jcasbin to 1.71.0
ihrasko Oct 28, 2024
102c9b5
Call countDown() on blocking shutdown only
ihrasko Oct 28, 2024
109d21b
Remove sleep() from LightyModuleTest
ihrasko Oct 29, 2024
68d1c4e
Rename test class
ihrasko Oct 29, 2024
98fac57
Cleanup controller tests
ihrasko Oct 29, 2024
4ea3de5
Do not mix blocking/unblocking calls
ihrasko Oct 29, 2024
bee9058
Increase module timeouts
ihrasko Oct 30, 2024
b5da5b8
Deprecate LightyModule#startBlocking
ihrasko Oct 29, 2024
dbf4100
Separate blocking shutdown
ihrasko Oct 31, 2024
8d3349e
Run tests in single thread
ihrasko Oct 28, 2024
99d9775
Fix check-style
ihrasko Oct 31, 2024
245d224
Add timeout to shutdown
ihrasko Oct 31, 2024
f28545e
Clean up tests
ihrasko Oct 31, 2024
bf0f519
Adopt 21.1.0 ODL MRI versions
Tobianas Nov 6, 2024
4b34901
Introduce JaxRsOpenApi
Tobianas Nov 6, 2024
433441b
Use newer revision of odl-netconf-device
Tobianas Nov 6, 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/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: mvn install -DskipTests=true -B -V -Psource-quality
- name: Maven test + SonarCloud
if: ${{ env.SONAR_TOKEN != 0 }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
run: mvn -T1 -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.java.source=21
-Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
-Dsonar.organization=${{ env.SONAR_ORGANIZATION }}
Expand All @@ -55,7 +55,7 @@ jobs:
-Dsonar.coverage.exclusions=**/lighty-codecs/**/*
- name: Maven test no SonarCloud
if: ${{ env.SONAR_TOKEN == 0 }}
run: mvn -B verify
run: mvn -T1 -B verify
- name: Upload surefire test results
uses: actions/upload-artifact@v4
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ls -1 yangs
#Run simulator for testing purpose
printLine
echo -e "-- Starting gNMI simulator device --\n"
java -jar ${GITHUB_WORKSPACE}/lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator/target/lighty-gnmi-device-simulator-21.0.0.jar -c ./simulator/example_config.json > /dev/null 2>&1 &
java -jar ${GITHUB_WORKSPACE}/lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator/target/lighty-gnmi-device-simulator-21.1.0-SNAPSHOT.jar -c ./simulator/example_config.json > /dev/null 2>&1 &

#Add yangs into controller through REST rpc
./add_yangs_via_rpc.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lighty-rnc-app/simulator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SIMULATOR_VERSION="20.1.0"
ARG SIMULATOR_VERSION="21.0.0"

FROM alpine:3.20.3 as clone

Expand All @@ -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
14 changes: 7 additions & 7 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
Lighty.io version contains 3 numbers representing MAJOR.MINOR.PATCH (X.Y.Z) levels.

MAJOR number is mapped to major OpenDaylight release
| Lighty.io | OpenDaylight |
|-----------|-----------------|
| 20.Y.Z | Calcium (20) |
| 19.Y.Z | Potassium (19) |
| ... | |
| Lighty.io | OpenDaylight |
|-----------|--------------------|
| 21.Y.Z | Scandium (2024.09) |
| 20.Y.Z | Calcium (2024.03) |
| ... | |

MINOR number is mapped to OpenDaylight service release (SR1, SR2, SR3, ..)
| Lighty.io | OpenDaylight |
|-----------|-----------------|
| 20.1.Z | Calcium SR1 |
| 20.2.Z | Calcium SR2 |
| 21.1.Z | Scandium SR1 |
| 21.2.Z | Scandium SR2 |
| ... | |

PATCH number represents Lighty.io release, usually security & bug fixes.
Expand Down
2 changes: 1 addition & 1 deletion lighty-applications/lighty-app-modules-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../../lighty-core/lighty-parent/pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>io.lighty.applications.rcgnmi</groupId>
<artifactId>lighty-rcgnmi-app-docker</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>

<properties>
<image.name>lighty-rcgnmi</image.name>
Expand Down Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.42.0</version>
<version>0.45.1</version>
<configuration>
<images>
<image>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../../../lighty-core/lighty-parent/pom.xml</relativePath>
</parent>

<groupId>io.lighty.applications.rcgnmi</groupId>
<artifactId>lighty-rcgnmi-app-module</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-app-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../../../lighty-core/lighty-app-parent/pom.xml</relativePath>
</parent>

<groupId>io.lighty.applications.rcgnmi</groupId>
<artifactId>lighty-rcgnmi-app</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>

<properties>
<application.main.class>io.lighty.applications.rcgnmi.app.RCgNMIApp</application.main.class>
Expand Down
2 changes: 1 addition & 1 deletion lighty-applications/lighty-rcgnmi-app-aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>io.lighty.applications.rcgnmi</groupId>
<artifactId>lighty-rcgnmi-app-aggregator</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>io.lighty.applications.rnc</groupId>
<artifactId>lighty-rnc-app-docker</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>

<properties>
<image.name>lighty-rnc</image.name>
Expand Down Expand Up @@ -91,7 +91,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.42.0</version>
<version>0.45.1</version>
<configuration>
<images>
<image>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-app-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../../../lighty-core/lighty-app-parent/pom.xml</relativePath>
</parent>

<groupId>io.lighty.applications.rnc</groupId>
<artifactId>lighty-rnc-app</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../../../lighty-core/lighty-parent/pom.xml</relativePath>
</parent>

<groupId>io.lighty.applications.rnc</groupId>
<artifactId>lighty-rnc-module</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion lighty-applications/lighty-rnc-app-aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>io.lighty.applications.rnc</groupId>
<artifactId>lighty-rnc-aggregator</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

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

<groupId>io.lighty.applications</groupId>
<artifactId>lighty-applications-aggregator</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
22 changes: 11 additions & 11 deletions lighty-core/dependency-versions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.lighty.core</groupId>
<artifactId>dependency-versions</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
<version>14.0.3</version>
<version>14.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -34,49 +34,49 @@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-artifacts</artifactId>
<version>0.20.1</version>
<version>0.20.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
<version>10.0.2</version>
<version>10.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
<version>7.0.3</version>
<version>7.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<version>14.0.2</version>
<version>14.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
<version>8.0.2</version>
<version>8.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<version>14.0.4</version>
<version>14.0.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.bgpcep</groupId>
<artifactId>bgpcep-artifacts</artifactId>
<version>0.22.4</version>
<version>0.22.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.0</version>
<version>5.11.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -273,7 +273,7 @@
<connection>scm:git:https://github.com/PANTHEONtech/lighty.git</connection>
<developerConnection>scm:git:https://github.com/PANTHEONtech/lighty.git</developerConnection>
<url>https://github.com/PANTHEONtech/lighty</url>
<tag>21.0.0</tag>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
Expand Down
2 changes: 1 addition & 1 deletion lighty-core/lighty-app-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../lighty-parent</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions lighty-core/lighty-binding-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-parent</artifactId>
<version>21.0.0</version>
<version>21.1.0-SNAPSHOT</version>
<relativePath>../lighty-parent</relativePath>
</parent>

Expand Down Expand Up @@ -49,12 +49,12 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<version>14.0.4</version>
<version>14.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-codegen</artifactId>
<version>14.0.4</version>
<version>14.0.5</version>
</dependency>
</dependencies>
<executions>
Expand Down
Loading
Loading