diff options
57 files changed, 92 insertions, 750 deletions
diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 7e395c9f9..59e334acf 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sli-plugins-artifacts</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sli-plugins-artifacts</name> @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <dependencyManagement> diff --git a/ccsdk-plugins-lighty/pom.xml b/ccsdk-plugins-lighty/pom.xml deleted file mode 100755 index 5630f3bc0..000000000 --- a/ccsdk-plugins-lighty/pom.xml +++ /dev/null @@ -1,49 +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>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>ccsdk-plugins-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-core-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>properties-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>restapi-call-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>restconf-client-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sshapi-call-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>template-node-lighty</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java b/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java deleted file mode 100644 index a6d662b85..000000000 --- a/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java +++ /dev/null @@ -1,133 +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.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import org.onap.ccsdk.sli.core.lighty.common.CcsdkLightyUtils; -import org.onap.ccsdk.sli.plugins.prop.lighty.PropertiesNodeModule; -import org.onap.ccsdk.sli.plugins.prop.lighty.RestApiCallNodeModule; -import org.onap.ccsdk.sli.plugins.restconf.lighty.RestconfClientModule; -import org.onap.ccsdk.sli.plugins.sshapicall.lighty.SshApiCallModule; -import org.onap.ccsdk.sli.plugins.template.lighty.TemplateNodeModule; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that groups all other LightyModules - * from the ccsdk-sli-plugins repository so they can be all treated as one component (for example started/stopped at once). - * For more information about the lighty.io visit the website https://lighty.io. - */ -public class CcsdkPluginsLightyModule extends AbstractLightyModule { - - private static final Logger LOG = LoggerFactory.getLogger(CcsdkPluginsLightyModule.class); - - private PropertiesNodeModule propertiesNodeModule; - private RestApiCallNodeModule restApiCallNodeModule; - private RestconfClientModule restconfClientModule; - private SshApiCallModule sshApiCallModule; - private TemplateNodeModule templateNodeModule; - - protected boolean initProcedure() { - LOG.debug("Initializing CCSDK Plugins Lighty module..."); - - this.propertiesNodeModule = new PropertiesNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(propertiesNodeModule)) { - LOG.error("Unable to start PropertiesNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.restApiCallNodeModule = new RestApiCallNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(restApiCallNodeModule)) { - LOG.error("Unable to start RestApiCallNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.restconfClientModule = new RestconfClientModule(restApiCallNodeModule.getPropertiesNode()); - if (!CcsdkLightyUtils.startLightyModule(restconfClientModule)) { - LOG.error("Unable to start RestconfClientModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.sshApiCallModule = new SshApiCallModule(); - if (!CcsdkLightyUtils.startLightyModule(sshApiCallModule)) { - LOG.error("Unable to start SshApiCallModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.templateNodeModule = new TemplateNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(templateNodeModule)) { - LOG.error("Unable to start TemplateNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - LOG.debug("CCSDK Plugins Lighty module was initialized successfully"); - return true; - } - - protected boolean stopProcedure() { - LOG.debug("Stopping CCSDK Plugins Lighty module..."); - - boolean stopSuccessful = true; - - if (!CcsdkLightyUtils.stopLightyModule(templateNodeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(sshApiCallModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(restconfClientModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(restApiCallNodeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(propertiesNodeModule)) { - stopSuccessful = false; - } - - if (stopSuccessful) { - LOG.debug("CCSDK Plugins Lighty module was stopped successfully"); - } else { - LOG.error("CCSDK Plugins Lighty module was not stopped successfully!"); - } - return stopSuccessful; - } - - public PropertiesNodeModule getPropertiesNodeModule() { - return propertiesNodeModule; - } - - public RestApiCallNodeModule getRestApiCallNodeModule() { - return restApiCallNodeModule; - } - - public RestconfClientModule getRestconfClientModule() { - return restconfClientModule; - } - - public SshApiCallModule getSshApiCallModule() { - return sshApiCallModule; - } - - public TemplateNodeModule getTemplateNodeModule() { - return templateNodeModule; - } -} diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml index bbcfb7570..1054f1903 100644 --- a/features/ccsdk-sli-plugins-all/pom.xml +++ b/features/ccsdk-sli-plugins-all/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-sli-plugins-all</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml index 1ace61b96..dff558c6a 100644 --- a/features/features-sli-plugins/pom.xml +++ b/features/features-sli-plugins/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-sli-plugins</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 334748748..529588c58 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-features-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 6e349ca4a..3780233ec 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-feature-aggregator</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: features</name> diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml index 3266f6604..88d931d33 100644 --- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml +++ b/grToolkit/features/ccsdk-gr-toolkit/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-gr-toolkit</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/grToolkit/features/features-gr-toolkit/pom.xml b/grToolkit/features/features-gr-toolkit/pom.xml index 511ba38a0..f22ed5d29 100755 --- a/grToolkit/features/features-gr-toolkit/pom.xml +++ b/grToolkit/features/features-gr-toolkit/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-gr-toolkit</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/grToolkit/features/pom.xml b/grToolkit/features/pom.xml index 34f706c8f..37179a551 100755 --- a/grToolkit/features/pom.xml +++ b/grToolkit/features/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <artifactId>gr-toolkit-features</artifactId> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/grToolkit/installer/pom.xml b/grToolkit/installer/pom.xml index 8c7ec32b2..4d097054f 100755 --- a/grToolkit/installer/pom.xml +++ b/grToolkit/installer/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> <application.name>ccsdk-gr-toolkit</application.name> diff --git a/grToolkit/model/pom.xml b/grToolkit/model/pom.xml index 8abf89a08..646564a90 100755 --- a/grToolkit/model/pom.xml +++ b/grToolkit/model/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-model</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml index 916df4427..b55df5cd7 100755 --- a/grToolkit/pom.xml +++ b/grToolkit/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: gr-toolkit</name> diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml index 0267f2488..f8228c2b5 100755 --- a/grToolkit/provider/pom.xml +++ b/grToolkit/provider/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <relativePath/> </parent> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <build> @@ -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>ccsdk-sli-plugins</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins</name> @@ -29,7 +29,6 @@ <module>grToolkit</module> <module>features</module> <module>artifacts</module> - <module>ccsdk-plugins-lighty</module> </modules> <scm> diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml index 4781ac382..b80d8f429 100644 --- a/properties-node/features/ccsdk-properties-node/pom.xml +++ b/properties-node/features/ccsdk-properties-node/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-properties-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml index 58944cceb..485d29534 100644 --- a/properties-node/features/features-properties-node/pom.xml +++ b/properties-node/features/features-properties-node/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-properties-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml index bd93644d7..83bc1da13 100755 --- a/properties-node/features/pom.xml +++ b/properties-node/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>properties-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml index 536e20478..3af5efc7a 100755 --- a/properties-node/installer/pom.xml +++ b/properties-node/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>properties-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/properties-node/lighty/pom.xml b/properties-node/lighty/pom.xml deleted file mode 100755 index 4e0fdb303..000000000 --- a/properties-node/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>properties-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: properties-node :: ${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>properties-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java b/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java deleted file mode 100644 index 345381120..000000000 --- a/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java +++ /dev/null @@ -1,45 +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.prop.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.prop.PropertiesNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the properties-node-provider artifact. - */ -public class PropertiesNodeModule extends AbstractLightyModule implements LightyModule { - - private PropertiesNode propertiesNode; - - @Override - protected boolean initProcedure() { - this.propertiesNode = new PropertiesNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public PropertiesNode getPropertiesNode() { - return this.propertiesNode; - } -} diff --git a/properties-node/pom.xml b/properties-node/pom.xml index 64036f7b1..0e5d576d3 100755 --- a/properties-node/pom.xml +++ b/properties-node/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>properties-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node</name> @@ -21,6 +21,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml index 8ca58c45c..262c4968d 100755 --- a/properties-node/provider/pom.xml +++ b/properties-node/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>properties-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/releases/0.6.0.yaml b/releases/0.6.0.yaml new file mode 100644 index 000000000..8f32b423b --- /dev/null +++ b/releases/0.6.0.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '0.6.0' +project: 'ccsdk-sli-plugins' +log_dir: 'ccsdk-sli-plugins-maven-stage-master/187/' diff --git a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml index 2697c4ea7..6f3109e4d 100644 --- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml +++ b/restapi-call-node/features/ccsdk-restapi-call-node/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-restapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/features/features-restapi-call-node/pom.xml b/restapi-call-node/features/features-restapi-call-node/pom.xml index 41a5d8a4b..4350f75b4 100644 --- a/restapi-call-node/features/features-restapi-call-node/pom.xml +++ b/restapi-call-node/features/features-restapi-call-node/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-restapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/features/pom.xml b/restapi-call-node/features/pom.xml index 981db516a..a49633d5a 100755 --- a/restapi-call-node/features/pom.xml +++ b/restapi-call-node/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>restapi-call-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml index 8b2d60ba6..697cfdcc8 100755 --- a/restapi-call-node/installer/pom.xml +++ b/restapi-call-node/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>restapi-call-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/restapi-call-node/lighty/pom.xml b/restapi-call-node/lighty/pom.xml deleted file mode 100755 index 5faa654b1..000000000 --- a/restapi-call-node/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>restapi-call-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: restapi-call-node :: ${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>restapi-call-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java b/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java deleted file mode 100644 index 01fa03e53..000000000 --- a/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java +++ /dev/null @@ -1,46 +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.prop.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the restapi-call-node-provider artifact. - */ -public class RestApiCallNodeModule extends AbstractLightyModule implements LightyModule { - - private RestapiCallNode restapiCallNode; - - @Override - protected boolean initProcedure() { - this.restapiCallNode = new RestapiCallNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public RestapiCallNode getPropertiesNode() { - return this.restapiCallNode; - } - -} diff --git a/restapi-call-node/pom.xml b/restapi-call-node/pom.xml index 7fbce0243..5bbd4d7b4 100755 --- a/restapi-call-node/pom.xml +++ b/restapi-call-node/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>restapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node</name> @@ -20,6 +20,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml index 7a03a38c3..a8d3cd886 100755 --- a/restapi-call-node/provider/pom.xml +++ b/restapi-call-node/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>restapi-call-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> 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> diff --git a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml index 44c5540f3..c0539c4d2 100644 --- a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml +++ b/sshapi-call-node/features/ccsdk-sshapi-call-node/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-sshapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/features/features-sshapi-call-node/pom.xml b/sshapi-call-node/features/features-sshapi-call-node/pom.xml index 893b68a76..6b9827c5c 100644 --- a/sshapi-call-node/features/features-sshapi-call-node/pom.xml +++ b/sshapi-call-node/features/features-sshapi-call-node/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-sshapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/features/pom.xml b/sshapi-call-node/features/pom.xml index 6e31170a7..7e367cea1 100755 --- a/sshapi-call-node/features/pom.xml +++ b/sshapi-call-node/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>sshapi-call-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/installer/pom.xml b/sshapi-call-node/installer/pom.xml index 1b248a3d6..475da0c7d 100755 --- a/sshapi-call-node/installer/pom.xml +++ b/sshapi-call-node/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>sshapi-call-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/sshapi-call-node/lighty/pom.xml b/sshapi-call-node/lighty/pom.xml deleted file mode 100755 index ecc411424..000000000 --- a/sshapi-call-node/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>sshapi-call-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: sshapi-call-node :: ${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>sshapi-call-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java b/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java deleted file mode 100644 index d8f1932d5..000000000 --- a/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java +++ /dev/null @@ -1,45 +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.sshapicall.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.sshapicall.SshApiCallNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the sshapi-call-node-provider artifact. - */ -public class SshApiCallModule extends AbstractLightyModule implements LightyModule { - - private SshApiCallNode sshApiCallNode; - - @Override - protected boolean initProcedure() { - this.sshApiCallNode = new SshApiCallNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public SshApiCallNode getSshApiCallNode() { - return this.sshApiCallNode; - } -} diff --git a/sshapi-call-node/pom.xml b/sshapi-call-node/pom.xml index 4238e7737..d46da1973 100755 --- a/sshapi-call-node/pom.xml +++ b/sshapi-call-node/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>sshapi-call-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node</name> @@ -20,6 +20,5 @@ <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/sshapi-call-node/provider/pom.xml b/sshapi-call-node/provider/pom.xml index cd920a875..0ad9e2a7b 100755 --- a/sshapi-call-node/provider/pom.xml +++ b/sshapi-call-node/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>sshapi-call-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/template-node/features/ccsdk-template-node/pom.xml b/template-node/features/ccsdk-template-node/pom.xml index 91658ae62..e34106988 100644 --- a/template-node/features/ccsdk-template-node/pom.xml +++ b/template-node/features/ccsdk-template-node/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-template-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml index 105a03245..11e459d0a 100644 --- a/template-node/features/features-template-node/pom.xml +++ b/template-node/features/features-template-node/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-template-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>feature</packaging> <dependencies> diff --git a/template-node/features/pom.xml b/template-node/features/pom.xml index 391a6ce14..40574a1f9 100644 --- a/template-node/features/pom.xml +++ b/template-node/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>template-node-features</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml index 2a5891dd4..7fbbeec74 100644 --- a/template-node/installer/pom.xml +++ b/template-node/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>template-node-installer</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/template-node/lighty/pom.xml b/template-node/lighty/pom.xml deleted file mode 100755 index f9bc94d81..000000000 --- a/template-node/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>template-node-lighty</artifactId> - <version>0.6.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>ccsdk-sli-plugins :: template-node :: ${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>template-node-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> diff --git a/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java b/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java deleted file mode 100644 index 1cd836bbb..000000000 --- a/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java +++ /dev/null @@ -1,45 +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.template.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.template.TemplateNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the template-node-provider artifact. - */ -public class TemplateNodeModule extends AbstractLightyModule implements LightyModule { - - private TemplateNode templateNode; - - @Override - protected boolean initProcedure() { - this.templateNode = new TemplateNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public TemplateNode getTemplateNode() { - return this.templateNode; - } -} diff --git a/template-node/pom.xml b/template-node/pom.xml index 4149f8746..58a83c841 100644 --- a/template-node/pom.xml +++ b/template-node/pom.xml @@ -5,18 +5,17 @@ <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>template-node</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>provider</module> <module>features</module> <module>installer</module> - <module>lighty</module> </modules> </project> diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml index f9cd3ef2d..477a539f2 100644 --- a/template-node/provider/pom.xml +++ b/template-node/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>template-node-provider</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/version.properties b/version.properties index 3fc281cbc..24c154ada 100644 --- a/version.properties +++ b/version.properties @@ -7,7 +7,7 @@ release_name=0 sprint_number=6 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |