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

Sync dependencies with odlparent 12.0.11 #1847

Merged
merged 18 commits into from
May 7, 2024
Merged

Sync dependencies with odlparent 12.0.11 #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
530875d
Bump maven-jar-plugin to 3.4.1
Tobianas May 7, 2024
66a0ea5
Bump commons-io to 2.16.1
Tobianas May 7, 2024
6abd200
Bump maven-source-plugin to 3.3.1
Tobianas May 7, 2024
9a4f874
Bump jacoco to 0.8.12
Tobianas May 7, 2024
2eaf398
Bump checkstyle to 10.15.0
Tobianas May 7, 2024
f9556e3
Bump maven-compiler-plugin to 3.13.0
Tobianas May 7, 2024
8300467
Bump maven-assembly-plugin to 3.7.1
Tobianas May 7, 2024
6b0d62e
Bump junit to 5.10.2
Tobianas May 7, 2024
b8b401d
Bump maven-{surefire,failsafe}-plugin to 3.2.5
Tobianas May 7, 2024
b584fcd
Bump maven-javadoc-plugin to 3.6.3
Tobianas May 7, 2024
f37ac32
Bump build-helper-maven-plugin to 3.5.0
Tobianas May 7, 2024
b841971
Bump maven-clean-plugin to 3.3.2
Tobianas May 7, 2024
e6bcae4
Bump maven-checkstyle-plugin to 3.3.1
Tobianas May 7, 2024
47b274c
Fixup variable declaration usage distance
Tobianas May 7, 2024
087845c
Bump maven-install-plugin to 3.1.1
Tobianas May 7, 2024
da0aaf6
Switch from javax.activation to jakarta
Tobianas May 7, 2024
b162bcb
Bump awaitility to 4.2.1
Tobianas May 7, 2024
25dada1
Bump json to 20240303
Tobianas May 7, 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
14 changes: 7 additions & 7 deletions lighty-core/dependency-versions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@

<!-- Other third-party stuff -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand Down Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.0</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -141,12 +141,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.0</version>
<version>4.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -232,7 +232,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20231013</version>
<version>20240303</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion .../lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ private AbstractDataStore prepareDataStore(final DatastoreContext datastoreConte
@Override
protected boolean stopProcedure() throws InterruptedException {
LOG.debug("Lighty Controller stopProcedure");
boolean stopSuccessful = true;
if (this.timer != null) {
this.timer.stop();
}
Expand All @@ -406,6 +405,7 @@ protected boolean stopProcedure() throws InterruptedException {
if (this.bindingDOMEntityOwnershipServiceAdapter != null) {
this.bindingDOMEntityOwnershipServiceAdapter.close();
}
boolean stopSuccessful = true;
if (this.akkaEntityOwnershipService != null) {
try {
this.akkaEntityOwnershipService.close();
Expand Down
26 changes: 13 additions & 13 deletions lighty-core/lighty-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifest>
Expand All @@ -106,22 +106,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.5</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
Expand All @@ -134,7 +134,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<executions>
<execution>
<id>jacoco-prepare-agent</id>
Expand All @@ -153,7 +153,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -166,12 +166,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.3</version>
<configuration combine.children="append">
<!-- Keep things quiet except for warnings/errors -->
<quiet>true</quiet>
Expand All @@ -187,13 +187,13 @@
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
<version>10.12.4</version>
<version>10.15.0</version>
</dependency>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -102,7 +102,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<executions>
<execution>
<id>jacoco-prepare-agent</id>
Expand All @@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.5</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
Expand Down
Loading