Bump lighty build to 19.0.0-SNAPSHOT for K

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

diff --git a/lighty/build.sh b/lighty/build.sh
index 07e582fb57813c8f823c0b85885e19b6e3caa29a..5f058f9d9343e80abf4cb9ede6fb00fae7cdf568 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
-mvn clean install -B -U -q -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -s ../tests/odl_settings.xml
+./build_lighty_core.sh
+mvn clean install -B -U -q -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -s ../tests/odl_settings.xml -DskipTests
 unzip -q target/tpce-bin.zip -d target

diff --git a/lighty/pom.xml b/lighty/pom.xml
index 6ad105ddabacafc228521b96e3c66f1082952bf0..93930ab79af88c3b950b81b8dff2595a03e2ddca 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>18.0.0</version>
+    <version>19.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -136,7 +136,7 @@
     </dependency>
     <dependency>
       <groupId>io.lighty.modules</groupId>
-      <artifactId>lighty-swagger</artifactId>
+      <artifactId>lighty-openapi</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/Main.java b/lighty/src/main/java/io/lighty/controllers/tpce/Main.java
index 49108c73d3f5161ec60b196cc9fde2f6739678fc..f7521205a17ed8320d52c1c19574060079c7222b 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/Main.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/Main.java
@@ -26,8 +26,8 @@ import io.lighty.modules.southbound.netconf.impl.NetconfSBPlugin;
 import io.lighty.modules.southbound.netconf.impl.NetconfTopologyPluginBuilder;
 import io.lighty.modules.southbound.netconf.impl.config.NetconfConfiguration;
 import io.lighty.modules.southbound.netconf.impl.util.NetconfConfigUtils;
+import io.lighty.openapi.OpenApiLighty;
 import io.lighty.server.LightyServerBuilder;
-import io.lighty.swagger.SwaggerLighty;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
@@ -163,7 +163,7 @@ public class Main {
                 new InetSocketAddress(restConfConfiguration.getInetAddress(), restConfConfiguration.getHttpPort()));
         CommunityRestConfBuilder communityRestConfBuilder = CommunityRestConfBuilder.from(
                 RestConfConfigUtils.getRestConfConfiguration(restConfConfiguration, lightyController.getServices()));
-        SwaggerLighty swagger = new SwaggerLighty(restConfConfiguration, jettyServerBuilder,
+        OpenApiLighty swagger = new OpenApiLighty(restConfConfiguration, jettyServerBuilder,
                 lightyController.getServices());
         swagger.start().get();
 

diff --git a/tox.ini b/tox.ini
index 45b98c3cdc4e9f83dd5f9975202006823f826f89..7cae5c70e9e8cf5f9b8b8dd8ddb30037f3d47ad3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist = buildcontroller
      sims221,build_karaf_tests221,tests_tapi,tests221,
      sims71,build_karaf_tests71,tests71,
      build_karaf_tests_hybrid,tests_hybrid,
-#     buildlighty,
+     buildlighty,
      docs
      docs-linkcheck
      checkbashisms