Bump Lighty build to Argon

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I633a03dd72971dd8409cac95d197f0497a1c9ea2

diff --git a/lighty/build.sh b/lighty/build.sh
index ee04d5e90e4f2b112c9c6971bebc5b88367d600b..e6121883fd80e8bf2792b102e69f891e40bd34bb 100755 (executable)
--- a/lighty/build.sh
+++ b/lighty/build.sh
@@ -2,6 +2,6 @@
 
 cd $(dirname "$0")
 export JDK_JAVA_OPTIONS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED"
-#./build_lighty_core.sh
+./build_lighty_core.sh
 mvn clean install -B -U -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -s ../tests/odl_settings.xml
 unzip -q target/tpce-bin.zip -d target

diff --git a/lighty/build_lighty_core.sh b/lighty/build_lighty_core.sh
index 3621fb1a4884c8e3f795f4f4db6b275ce8b15896..28c467b1f3caaba221e08e0be871b05bd1206684 100755 (executable)
--- a/lighty/build_lighty_core.sh
+++ b/lighty/build_lighty_core.sh
@@ -4,7 +4,7 @@ cd $(dirname "$0")
 cd ..
 git clone https://github.com/PantheonTechnologies/lighty-core.git
 cd lighty-core
-#git checkout master
-git checkout 15.1.x
+git checkout main
+#git checkout 18.0.x
 export JDK_JAVA_OPTIONS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED"
 mvn clean install -B -U -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

diff --git a/lighty/pom.xml b/lighty/pom.xml
index 6586ac4ea84d8a2bf1f4d100343dafcb449f7b85..f599e6ae19787b21efb3b6728ebfec9d78b99e89 100644 (file)
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.lighty.core</groupId>
     <artifactId>lighty-app-parent</artifactId>
-    <version>17.1.0</version>
+    <version>18.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
index 0505c1269937e8b108bc9d342591089e5bb1c61b..93cb0f5829ed08aaee54752cd3c264b0b2c86bad 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
@@ -27,7 +27,6 @@ import org.opendaylight.transportpce.common.mapping.PortMappingVersion221;
 import org.opendaylight.transportpce.common.mapping.PortMappingVersion710;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121;
@@ -290,7 +289,6 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
         LOG.info("Shutting down PCE provider ...");
         pceProvider.close();
         LOG.info("Shutting down transaction providers ...");
-        networkTransaction.close();
         deviceTransactionManager.preDestroy();
         LOG.info("Shutdown done.");
         return true;