diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-12 14:08:33 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-12 14:08:33 -0500 |
commit | dffc1fd635470b0fc0e940f78e69d8f0ab0d14f0 (patch) | |
tree | 92d6f8c71d390223e0b47520a5befd12f59126c7 /features | |
parent | 3e8b55b9d3841c175776d84d54edf2a284f1f4b5 (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 'features')
-rw-r--r-- | features/ccsdk-gr-toolkit/pom.xml | 37 | ||||
-rw-r--r-- | features/ccsdk-properties-node/pom.xml | 30 | ||||
-rw-r--r-- | features/ccsdk-restapi-call-node/pom.xml | 39 | ||||
-rw-r--r-- | features/ccsdk-restconf-client/pom.xml | 35 | ||||
-rw-r--r-- | features/ccsdk-sshapi-call-node/pom.xml | 42 | ||||
-rw-r--r-- | features/ccsdk-template-node/pom.xml | 27 | ||||
-rw-r--r-- | features/features-sli-plugins/pom.xml | 39 | ||||
-rwxr-xr-x | features/installer/pom.xml | 79 | ||||
-rwxr-xr-x | features/pom.xml | 6 |
9 files changed, 333 insertions, 1 deletions
diff --git a/features/ccsdk-gr-toolkit/pom.xml b/features/ccsdk-gr-toolkit/pom.xml new file mode 100644 index 000000000..1ac3f96b3 --- /dev/null +++ b/features/ccsdk-gr-toolkit/pom.xml @@ -0,0 +1,37 @@ +<?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-gr-toolkit</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> + + <dependencies> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>odl-mdsal-broker</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>gr-toolkit-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>gr-toolkit-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> diff --git a/features/ccsdk-properties-node/pom.xml b/features/ccsdk-properties-node/pom.xml new file mode 100644 index 000000000..9cdee255b --- /dev/null +++ b/features/ccsdk-properties-node/pom.xml @@ -0,0 +1,30 @@ +<?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-properties-node</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> + + + <dependencies> + + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>properties-node-provider</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> +</project> diff --git a/features/ccsdk-restapi-call-node/pom.xml b/features/ccsdk-restapi-call-node/pom.xml new file mode 100644 index 000000000..1347c7a99 --- /dev/null +++ b/features/ccsdk-restapi-call-node/pom.xml @@ -0,0 +1,39 @@ +<?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-restapi-call-node</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> + + + <dependencies> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>restapi-call-node-provider</artifactId> + <version>${project.version}</version> + <exclusions> + <!-- let the filter module start and manage the common code --> + <exclusion> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> +</project> diff --git a/features/ccsdk-restconf-client/pom.xml b/features/ccsdk-restconf-client/pom.xml new file mode 100644 index 000000000..70c75b92e --- /dev/null +++ b/features/ccsdk-restconf-client/pom.xml @@ -0,0 +1,35 @@ +<?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/features/ccsdk-sshapi-call-node/pom.xml b/features/ccsdk-sshapi-call-node/pom.xml new file mode 100644 index 000000000..838405be6 --- /dev/null +++ b/features/ccsdk-sshapi-call-node/pom.xml @@ -0,0 +1,42 @@ +<?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-sshapi-call-node</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> + + + +<!-- + <properties> + <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> + </properties> + + <dependencies> + + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sshapi-call-node-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + --> +</project> diff --git a/features/ccsdk-template-node/pom.xml b/features/ccsdk-template-node/pom.xml new file mode 100644 index 000000000..7f4c16925 --- /dev/null +++ b/features/ccsdk-template-node/pom.xml @@ -0,0 +1,27 @@ +<?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-template-node</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>template-node-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml index 1e82332bd..4f8cd5c19 100644 --- a/features/features-sli-plugins/pom.xml +++ b/features/features-sli-plugins/pom.xml @@ -18,6 +18,45 @@ <dependencies> <dependency> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>ccsdk-gr-toolkit</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>ccsdk-properties-node</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>ccsdk-restapi-call-node</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>ccsdk-sli-plugins-all</artifactId> <version>${project.version}</version> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 70393eb81..686eb812c 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -24,7 +24,84 @@ </properties> <dependencies> - + <dependency> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>ccsdk-gr-toolkit</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>ccsdk-properties-node</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>ccsdk-restapi-call-node</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>ccsdk-restconf-client</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>ccsdk-sshapi-call-node</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>ccsdk-template-node</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>${application.name}</artifactId> diff --git a/features/pom.xml b/features/pom.xml index 59f2e3299..7f8bb9122 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -17,6 +17,12 @@ <name>ccsdk-sli-plugins :: features</name> <modules> + <module>ccsdk-gr-toolkit</module> + <module>ccsdk-properties-node</module> + <module>ccsdk-restapi-call-node</module> + <module>ccsdk-restconf-client</module> + <module>ccsdk-sshapi-call-node</module> + <module>ccsdk-template-node</module> <module>ccsdk-sli-plugins-all</module> <module>features-sli-plugins</module> <module>installer</module> |