aboutsummaryrefslogtreecommitdiffstats
path: root/ansible-adapter
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 12:42:39 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 12:42:39 -0500
commitbc18e2c019f4b16752ae25fa50b436e7cd65c8e8 (patch)
tree7e1c5f91d12f8fc854105d888938e572e3c76737 /ansible-adapter
parent9ed4144aa7a72da788306a420b8a9a26fd0d4401 (diff)
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer Change-Id: I4dc4ad3c139522b12f41f1786ef16bfdd556f2b9 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'ansible-adapter')
-rw-r--r--ansible-adapter/ansible-adapter-features/.gitignore26
-rw-r--r--ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml43
-rwxr-xr-xansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml33
-rw-r--r--ansible-adapter/ansible-adapter-features/pom.xml33
-rw-r--r--ansible-adapter/ansible-adapter-installer/pom.xml14
-rw-r--r--ansible-adapter/pom.xml1
6 files changed, 1 insertions, 149 deletions
diff --git a/ansible-adapter/ansible-adapter-features/.gitignore b/ansible-adapter/ansible-adapter-features/.gitignore
deleted file mode 100644
index 8820cee5..00000000
--- a/ansible-adapter/ansible-adapter-features/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# ============LICENSE_START==========================================
-# ONAP : APPC
-# ===================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the License);
-# you may not use this software 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END============================================
-/target/
-/target-ide/
-/bin/
-/classes/
-/.settings/
diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
deleted file mode 100644
index 9b6c89bb..00000000
--- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
+++ /dev/null
@@ -1,43 +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.adaptors</groupId>
- <artifactId>ccsdk-ansible-adapter</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ansible-adapter-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
- </dependencies>
-</project>
diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
deleted file mode 100755
index 91a6fc9b..00000000
--- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
+++ /dev/null
@@ -1,33 +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.adaptors</groupId>
- <artifactId>features-ansible-adapter</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-ansible-adapter</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml
deleted file mode 100644
index 9d9f088c..00000000
--- a/ansible-adapter/ansible-adapter-features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
- ONAP : APPC ================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================
- Copyright (C) 2017 Amdocs =============================================================================
- 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. ECOMP is
- a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= -->
-<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>
- <artifactId>odlparent-lite</artifactId>
- <groupId>org.onap.ccsdk.parent</groupId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>ansible-adapter-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>ccsdk-ansible-adapter</module>
- <module>features-ansible-adapter</module>
- </modules>
-</project>
diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index f4eee6e6..82a9a080 100644
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -42,19 +42,7 @@
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
<dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>${application.name}</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adapter-bundle</artifactId>
diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml
index 68ffdce8..cf3667d8 100644
--- a/ansible-adapter/pom.xml
+++ b/ansible-adapter/pom.xml
@@ -183,7 +183,6 @@
<modules>
<module>ansible-adapter-bundle</module>
- <module>ansible-adapter-features</module>
<module>ansible-adapter-installer</module>
</modules>
</project>