diff --git a/lighty-core/dependency-versions/pom.xml b/lighty-core/dependency-versions/pom.xml index 775253aa1a..b53154a638 100644 --- a/lighty-core/dependency-versions/pom.xml +++ b/lighty-core/dependency-versions/pom.xml @@ -83,9 +83,9 @@ - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.1.3 com.google.inject @@ -129,7 +129,7 @@ org.junit junit-bom - 5.10.0 + 5.10.2 pom import @@ -141,12 +141,12 @@ commons-io commons-io - 2.16.0 + 2.16.1 org.awaitility awaitility - 4.2.0 + 4.2.1 org.apache.commons @@ -232,7 +232,7 @@ org.json json - 20231013 + 20240303 test diff --git a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java index 5db7e2eee9..0c4a45f46c 100644 --- a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java +++ b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java @@ -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(); } @@ -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(); diff --git a/lighty-core/lighty-parent/pom.xml b/lighty-core/lighty-parent/pom.xml index 8354df990b..6c84fb1f1f 100644 --- a/lighty-core/lighty-parent/pom.xml +++ b/lighty-core/lighty-parent/pom.xml @@ -79,12 +79,12 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 org.apache.maven.plugins @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 @@ -106,22 +106,22 @@ org.apache.maven.plugins maven-install-plugin - 3.1.0 + 3.1.1 org.apache.maven.plugins maven-assembly-plugin - 3.6.0 + 3.7.1 org.apache.maven.plugins maven-failsafe-plugin - 3.1.0 + 3.2.5 org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.2.5 1 true @@ -134,7 +134,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 jacoco-prepare-agent @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources @@ -166,12 +166,12 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.5.0 org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 true @@ -187,13 +187,13 @@ maven-checkstyle-plugin - 3.2.1 + 3.3.1 com.puppycrawl.tools checkstyle - 10.12.4 + 10.15.0 com.github.sevntu-checkstyle diff --git a/lighty-examples/lighty-controller-springboot-netconf/pom.xml b/lighty-examples/lighty-controller-springboot-netconf/pom.xml index eac0e40db4..252a63ed99 100644 --- a/lighty-examples/lighty-controller-springboot-netconf/pom.xml +++ b/lighty-examples/lighty-controller-springboot-netconf/pom.xml @@ -102,7 +102,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 jacoco-prepare-agent @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.2.5 1 true