summaryrefslogtreecommitdiffstats
path: root/restconf-client
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-12 14:08:33 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-12 14:08:33 -0500
commitdffc1fd635470b0fc0e940f78e69d8f0ab0d14f0 (patch)
tree92d6f8c71d390223e0b47520a5befd12f59126c7 /restconf-client
parent3e8b55b9d3841c175776d84d54edf2a284f1f4b5 (diff)
Refactor karaf features into single module
Refactor karaf features installation into a single installation bundle instead of embedding in each module's installer. Change-Id: I281973c5d6fda5eeb0483cf9e6d058b8a4992ed3 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'restconf-client')
-rw-r--r--restconf-client/features/ccsdk-restconf-client/pom.xml35
-rw-r--r--restconf-client/features/features-restconf-client/pom.xml29
-rwxr-xr-xrestconf-client/features/pom.xml22
-rwxr-xr-xrestconf-client/installer/pom.xml14
-rwxr-xr-xrestconf-client/pom.xml1
5 files changed, 0 insertions, 101 deletions
diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml
deleted file mode 100644
index 70c75b92..00000000
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ /dev/null
@@ -1,35 +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>single-feature-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>ccsdk-restconf-client</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <properties>
- <skip.karaf.featureTest>true</skip.karaf.featureTest>
- </properties>
-
- <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
-
-
-
-
- <dependencies>
-
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>restconf-client-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/restconf-client/features/features-restconf-client/pom.xml b/restconf-client/features/features-restconf-client/pom.xml
deleted file mode 100644
index 5849dc03..00000000
--- a/restconf-client/features/features-restconf-client/pom.xml
+++ /dev/null
@@ -1,29 +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>feature-repo-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>features-restconf-client</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-restconf-client</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/restconf-client/features/pom.xml b/restconf-client/features/pom.xml
deleted file mode 100755
index b39f987b..00000000
--- a/restconf-client/features/pom.xml
+++ /dev/null
@@ -1,22 +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.5.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>restconf-client-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-restconf-client</module>
- <module>features-restconf-client</module>
- </modules>
-</project>
diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml
index db75310b..f7704298 100755
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/pom.xml
@@ -27,20 +27,6 @@
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>${application.name}</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>restconf-client-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index 0f04513a..76fb65c6 100755
--- a/restconf-client/pom.xml
+++ b/restconf-client/pom.xml
@@ -18,7 +18,6 @@
<modules>
<module>provider</module>
- <module>features</module>
<module>installer</module>
</modules>
</project>