8 files changed, 12 insertions, 119 deletions
diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml
index 8faa16a00..28f3fc509 100644
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ b/restconf-client/features/ccsdk-restconf-client/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>ccsdk-restconf-client</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>0.6.1-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
 	<properties>
diff --git a/restconf-client/features/features-restconf-client/pom.xml b/restconf-client/features/features-restconf-client/pom.xml
index 790e5b128..49360057e 100644
--- a/restconf-client/features/features-restconf-client/pom.xml
+++ b/restconf-client/features/features-restconf-client/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>feature-repo-parent</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>features-restconf-client</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>0.6.1-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
 	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
diff --git a/restconf-client/features/pom.xml b/restconf-client/features/pom.xml
index 4537098fb..d3123f7ec 100755
--- a/restconf-client/features/pom.xml
+++ b/restconf-client/features/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restconf-client-features</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml
index 09d290044..7f80aa951 100755
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restconf-client-installer</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
diff --git a/restconf-client/lighty/pom.xml b/restconf-client/lighty/pom.xml
deleted file mode 100755
index 7fdf6b8fc..000000000
--- a/restconf-client/lighty/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.plugins</groupId>
-	<artifactId>restconf-client-lighty</artifactId>
-	<version>0.6.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
-	<url>http://maven.apache.org</url>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>ccsdk-lighty-dependency-versions</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>io.lighty.core</groupId>
-			<artifactId>lighty-controller</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.plugins</groupId>
-			<artifactId>restconf-client-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java b/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java
deleted file mode 100644
index bb0fc90da..000000000
--- a/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * Copyright (c) 2019 PANTHEON.tech s.r.o.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- * OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- *
- */
-package org.onap.ccsdk.sli.plugins.restconf.lighty;
-
-import io.lighty.core.controller.api.AbstractLightyModule;
-import io.lighty.core.controller.api.LightyModule;
-import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
-import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode;
-import org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode;
-
-/**
- * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from
- * the restconf-client-provider artifact.
- */
-public class RestconfClientModule extends AbstractLightyModule implements LightyModule {
-
-    private final RestapiCallNode restapiCallNode;
-
-    private RestconfApiCallNode restconfApiCallNode;
-    private RestconfDiscoveryNode restconfDiscoveryNode;
-
-    public RestconfClientModule(final RestapiCallNode restapiCallNode) {
-        this.restapiCallNode = restapiCallNode;
-    }
-
-    @Override
-    protected boolean initProcedure() {
-        this.restconfApiCallNode = new RestconfApiCallNode(restapiCallNode);
-        this.restconfDiscoveryNode = new RestconfDiscoveryNode(restconfApiCallNode);
-        return true;
-    }
-
-    @Override
-    protected boolean stopProcedure() {
-        return true;
-    }
-
-    public RestconfApiCallNode getRestconfApiCallNode() {
-        return this.restconfApiCallNode;
-    }
-
-    public RestconfDiscoveryNode getRestconfDiscoveryNode() {
-        return this.restconfDiscoveryNode;
-    }
-}
diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index 221987d8c..2d1893f6d 100755
--- a/restconf-client/pom.xml
+++ b/restconf-client/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restconf-client</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client</name>
@@ -20,6 +20,5 @@
         <module>provider</module>
         <module>features</module>
         <module>installer</module>
-        <module>lighty</module>
     </modules>
 </project>
diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index ab685bb8b..953db6933 100755
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restconf-client-provider</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>