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 /filters | |
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>
Diffstat (limited to 'filters')
-rw-r--r-- | filters/features/ccsdk-filters/pom.xml | 46 | ||||
-rw-r--r-- | filters/features/features-filters/pom.xml | 29 | ||||
-rwxr-xr-x | filters/features/pom.xml | 23 | ||||
-rwxr-xr-x | filters/installer/pom.xml | 17 | ||||
-rw-r--r-- | filters/pom.xml | 1 |
5 files changed, 0 insertions, 116 deletions
diff --git a/filters/features/ccsdk-filters/pom.xml b/filters/features/ccsdk-filters/pom.xml deleted file mode 100644 index ebe15f856..000000000 --- a/filters/features/ccsdk-filters/pom.xml +++ /dev/null @@ -1,46 +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.core</groupId> - <artifactId>ccsdk-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>filters-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <excludedArtifactIds> - <!-- let opendaylight start these features/jars to avoid conflicts at runtime --> - <excludedArtifactId>slf4j-api</excludedArtifactId> - <excludedArtifactId>javax.annotation-api</excludedArtifactId> - <excludedArtifactId>javax.servlet-api</excludedArtifactId> - <excludedArtifactId>javax.ws.rs-api</excludedArtifactId> - </excludedArtifactIds> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/filters/features/features-filters/pom.xml b/filters/features/features-filters/pom.xml deleted file mode 100644 index 7ae082028..000000000 --- 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 985e446f6..000000000 --- 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 6bef4c19a..089b2f430 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 4cd8c759e..005ce2f19 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> |