summaryrefslogtreecommitdiffstats
path: root/ansible-adapter
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-03 16:24:22 -0500
committerDan Timoney <dtimoney@att.com>2019-01-11 22:58:05 +0000
commitf200a729ebedc2d292251e4f8a1b20b2e1668b7d (patch)
tree17313e6ec37661f887ecaacfd88a79892b6a3288 /ansible-adapter
parent0cf282459fe7cf129a390d59d46b6de299ac86db (diff)
Changes for Fluorine
Update sli/adaptors to compile against ODL Fluorine Change-Id: I9ec4c89301678e9398dc2c43db4cffff03953806 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'ansible-adapter')
-rw-r--r--ansible-adapter/ansible-adapter-bundle/pom.xml27
-rw-r--r--ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml23
-rwxr-xr-xansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml4
-rw-r--r--ansible-adapter/ansible-adapter-features/pom.xml4
-rw-r--r--ansible-adapter/ansible-adapter-installer/pom.xml4
-rw-r--r--ansible-adapter/pom.xml4
6 files changed, 34 insertions, 32 deletions
diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml
index 0033d2dee..5ae79b34f 100644
--- a/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -12,21 +12,40 @@
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">
+<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>binding-parent</artifactId>
- <version>1.2.0</version>
- <relativePath/>
+ <version>1.2.1-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adapter-bundle</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
+
+ <properties>
+ <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>com.att.eelf</groupId>
diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
index 5e2b41f9e..daceea7e9 100644
--- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-ansible-adapter</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name>
@@ -20,29 +20,12 @@
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${odl.mdsal.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>mdsal-model-artifacts</artifactId>
- <version>${odl.mdsal.model.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<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>
diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
index d59a943f5..f742f14e3 100755
--- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>features-ansible-adapter</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
diff --git a/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml
index 8841b956c..2fd0e8dc7 100644
--- a/ansible-adapter/ansible-adapter-features/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/pom.xml
@@ -16,12 +16,12 @@
<parent>
<artifactId>odlparent-lite</artifactId>
<groupId>org.onap.ccsdk.parent</groupId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adapter-features</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
<packaging>pom</packaging>
diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index f9d4d058b..f1cc2a47c 100644
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adapter-installer</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
<packaging>pom</packaging>
<properties>
diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml
index 4b0db6bb2..083fbb98b 100644
--- a/ansible-adapter/pom.xml
+++ b/ansible-adapter/pom.xml
@@ -27,13 +27,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adaptor</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<name>ccsdk-sli-adaptors :: ansible-adapter</name>
<description>Abstractions to interact with Ansible server via REST</description>
<packaging>pom</packaging>