diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-13 10:24:29 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-13 10:24:29 -0500 |
| commit | a55a4e30507c25c21c7f1df830f5d5189e03c038 (patch) | |
| tree | c1c23e7259521fd3bbd1711c837f6ea939ed001d | |
| parent | 6fd84f1422338180459ca6442be96440f116da44 (diff) | |
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer
Change-Id: I2afade9862227175853d9fe36c5bc9b113e3d582
Issue-ID: CCSDK-1754
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
32 files changed, 85 insertions, 393 deletions
diff --git a/dblib/features/features-dblib/pom.xml b/dblib/features/features-dblib/pom.xml deleted file mode 100644 index 72af7777..00000000 --- a/dblib/features/features-dblib/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.core</groupId> - <artifactId>features-dblib</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-dblib</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml deleted file mode 100755 index 9addcdb4..00000000 --- a/dblib/features/pom.xml +++ /dev/null @@ -1,23 +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> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>dblib-feature-aggregator</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - - <modules> - <module>features-dblib</module> - <module>ccsdk-dblib</module> - </modules> -</project> diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index bf19ba0e..caa0c0be 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -27,20 +27,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</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.core</groupId> <artifactId>dblib-provider</artifactId> <version>${project.version}</version> </dependency> diff --git a/dblib/pom.xml b/dblib/pom.xml index 23284604..2fb49cbf 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -22,7 +22,6 @@ <modules> <module>provider</module> - <module>features</module> <module>installer</module> </modules> </project> diff --git a/dblib/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml index 883cd1d8..883cd1d8 100644 --- a/dblib/features/ccsdk-dblib/pom.xml +++ b/features/ccsdk-dblib/pom.xml diff --git a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml b/features/ccsdk-dblib/src/main/feature/feature.xml index 771c3745..771c3745 100644 --- a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml +++ b/features/ccsdk-dblib/src/main/feature/feature.xml diff --git a/filters/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml index ebe15f85..ebe15f85 100644 --- a/filters/features/ccsdk-filters/pom.xml +++ b/features/ccsdk-filters/pom.xml diff --git a/sli/features/odl-sli/pom.xml b/features/ccsdk-sli/pom.xml index f810e43a..f810e43a 100644 --- a/sli/features/odl-sli/pom.xml +++ b/features/ccsdk-sli/pom.xml diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml index 032d7825..032d7825 100644 --- a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml +++ b/features/ccsdk-sliPluginUtils/pom.xml diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml index 80180c5a..80180c5a 100644 --- a/sliapi/features/ccsdk-sliapi/pom.xml +++ b/features/ccsdk-sliapi/pom.xml diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml index ae54dcfd..ae54dcfd 100644 --- a/utils/features/ccsdk-slicore-utils/pom.xml +++ b/features/ccsdk-slicore-utils/pom.xml diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 32c17788..1cece642 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -24,7 +24,84 @@ </properties> <dependencies> - + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-slicore-utils</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.core</groupId> + <artifactId>ccsdk-dblib</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.core</groupId> + <artifactId>ccsdk-filters</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.core</groupId> + <artifactId>ccsdk-sli</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.core</groupId> + <artifactId>ccsdk-sliapi</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.core</groupId> + <artifactId>ccsdk-sliPluginUtils</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.core</groupId> <artifactId>${application.name}</artifactId> @@ -98,7 +175,7 @@ <useRepositoryLayout>true</useRepositoryLayout> <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j</includeGroupIds> + <includeGroupIds>org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j</includeGroupIds> <excludeArtifactIds>utils-provider,slf4j-api</excludeArtifactIds> <scope>provided</scope> </configuration> diff --git a/features/pom.xml b/features/pom.xml index 6e500172..1dd48d6d 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -17,6 +17,12 @@ <name>ccsdk-sli-core :: features</name> <modules> + <module>ccsdk-slicore-utils</module> + <module>ccsdk-dblib</module> + <module>ccsdk-filters</module> + <module>ccsdk-sli</module> + <module>ccsdk-sliapi</module> + <module>ccsdk-sliPluginUtils</module> <module>ccsdk-sli-core-all</module> <module>features-sli-core</module> <module>installer</module> diff --git a/filters/features/features-filters/pom.xml b/filters/features/features-filters/pom.xml deleted file mode 100644 index 7ae08202..00000000 --- a/filters/features/features-filters/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.core</groupId> - <artifactId>features-filters</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-filters</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/filters/features/pom.xml b/filters/features/pom.xml deleted file mode 100755 index 985e446f..00000000 --- a/filters/features/pom.xml +++ /dev/null @@ -1,23 +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> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>filters-features-aggregator</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> - - <modules> - <module>features-filters</module> - <module>ccsdk-filters</module> - </modules> -</project> diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index 6bef4c19..089b2f43 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -24,28 +24,11 @@ </properties> <dependencies> - - <dependency> - <groupId>org.onap.ccsdk.sli.core</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.core</groupId> <artifactId>filters-provider</artifactId> <version>${project.version}</version> </dependency> - - </dependencies> <build> diff --git a/filters/pom.xml b/filters/pom.xml index 4cd8c759..005ce2f1 100644 --- a/filters/pom.xml +++ b/filters/pom.xml @@ -22,7 +22,6 @@ <modules> <module>provider</module> - <module>features</module> <module>installer</module> </modules> </project> diff --git a/sli/features/features-sli/pom.xml b/sli/features/features-sli/pom.xml deleted file mode 100644 index 80c4102f..00000000 --- a/sli/features/features-sli/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.core</groupId> - <artifactId>features-sli</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sli</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - </dependencies> - -</project> diff --git a/sli/features/pom.xml b/sli/features/pom.xml deleted file mode 100644 index 6970f268..00000000 --- a/sli/features/pom.xml +++ /dev/null @@ -1,23 +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> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-feature-aggregator</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> - - <modules> - <module>features-sli</module> - <module>odl-sli</module> - </modules> -</project> diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 866e9b03..8a39f79c 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -37,20 +37,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</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.core</groupId> <artifactId>sli-common</artifactId> <version>${project.version}</version> </dependency> diff --git a/sli/pom.xml b/sli/pom.xml index 895fae1f..8ef0c9c9 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -26,7 +26,6 @@ <module>common</module> <module>provider</module> <module>recording</module> - <module>features</module> <module>installer</module> </modules> </project> diff --git a/sliPluginUtils/features/features-sliPluginUtils/pom.xml b/sliPluginUtils/features/features-sliPluginUtils/pom.xml deleted file mode 100644 index eec15e64..00000000 --- a/sliPluginUtils/features/features-sliPluginUtils/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.core</groupId> - <artifactId>features-sliPluginUtils</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sliPluginUtils</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml deleted file mode 100755 index c43c18d6..00000000 --- a/sliPluginUtils/features/pom.xml +++ /dev/null @@ -1,23 +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> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliPluginUtils-features</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> - - <modules> - <module>features-sliPluginUtils</module> - <module>ccsdk-sliPluginUtils</module> - </modules> -</project> diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 9d71a964..fa99d4cc 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -48,20 +48,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</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.core</groupId> <artifactId>sliPluginUtils-provider</artifactId> <version>${project.version}</version> </dependency> diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 22b4bd90..61e6c47b 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/pom.xml @@ -19,7 +19,6 @@ <modules> <module>provider</module> - <module>features</module> <module>installer</module> </modules> </project> diff --git a/sliapi/features/features-sliapi/pom.xml b/sliapi/features/features-sliapi/pom.xml deleted file mode 100644 index 2acfad7b..00000000 --- a/sliapi/features/features-sliapi/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.core</groupId> - <artifactId>features-sliapi</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sliapi</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml deleted file mode 100755 index 448c9da4..00000000 --- a/sliapi/features/pom.xml +++ /dev/null @@ -1,23 +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> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliapi-feature-aggregator</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> - - <modules> - <module>features-sliapi</module> - <module>ccsdk-sliapi</module> - </modules> -</project> diff --git a/sliapi/pom.xml b/sliapi/pom.xml index 71bb22e6..d3dd4e21 100755 --- a/sliapi/pom.xml +++ b/sliapi/pom.xml @@ -18,7 +18,6 @@ <modules> <module>model</module> - <module>features</module> <module>provider</module> <module>installer</module> </modules> diff --git a/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml deleted file mode 100644 index 6e26d1dc..00000000 --- a/utils/features/features-util/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.core</groupId> - <artifactId>features-util</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-slicore-utils</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/utils/features/pom.xml b/utils/features/pom.xml deleted file mode 100755 index 594c6e1e..00000000 --- a/utils/features/pom.xml +++ /dev/null @@ -1,23 +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> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>utils-features-aggregator</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> - - <modules> - <module>features-util</module> - <module>ccsdk-slicore-utils</module> - </modules> -</project> diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml index cbe0596a..d69cc74a 100755 --- a/utils/installer/pom.xml +++ b/utils/installer/pom.xml @@ -27,20 +27,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</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.core</groupId> <artifactId>utils-provider</artifactId> <version>${project.version}</version> </dependency> diff --git a/utils/pom.xml b/utils/pom.xml index a5529f31..2c421107 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -22,7 +22,6 @@ <modules> <module>provider</module> - <module>features</module> <module>installer</module> </modules> </project> |