summaryrefslogtreecommitdiffstats
path: root/ansible-adapter
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-03-05 11:51:01 -0500
committerDan Timoney <dtimoney@att.com>2020-03-05 15:46:51 -0500
commita612cdd3fbed35c4d5b454c6f0329fa6ecec22e1 (patch)
tree0d16ccdd850bf6351e76ffdb3148c252647f4422 /ansible-adapter
parentfc2570e434d72144c3adac184f85c93a2c0c834e (diff)
Roll master to Guilin
Roll versions of master for early Guilin development Change-Id: Id725abd9ecb3c67b2687e15286cb2f2bcd50be1a Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'ansible-adapter')
-rw-r--r--ansible-adapter/ansible-adapter-bundle/pom.xml14
-rw-r--r--ansible-adapter/ansible-adapter-installer/pom.xml12
-rw-r--r--ansible-adapter/pom.xml86
3 files changed, 59 insertions, 53 deletions
diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml
index cad248b06..e0ac33813 100644
--- a/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -14,19 +14,20 @@
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>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adapter-bundle</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
+ <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
<properties>
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
@@ -44,7 +45,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>com.att.eelf</groupId>
@@ -91,13 +91,13 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -128,6 +128,4 @@
</dependencies>
-
-
</project>
diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index 2e09acc9e..22295c283 100644
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -24,23 +24,28 @@
-->
<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.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
+
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adapter-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
+ <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
+
<properties>
<application.name>ccsdk-ansible-adapter</application.name>
<features.boot>${application.name}</features.boot>
<features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
+
<dependencies>
<dependency>
@@ -51,6 +56,7 @@
</dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml
index 6cea61f87..e1b6482a0 100644
--- a/ansible-adapter/pom.xml
+++ b/ansible-adapter/pom.xml
@@ -22,21 +22,61 @@
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/maven-v4_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>odlparent-lite</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ansible-adaptor</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<name>ccsdk-sli-adaptors :: ansible-adapter</name>
<description>Abstractions to interact with Ansible server via REST</description>
- <packaging>pom</packaging>
+
+ <modules>
+ <module>ansible-adapter-bundle</module>
+ <module>ansible-adapter-installer</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>ansible-adapter-features</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>ansible-adapter-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ </dependencies>
+
+
+ </dependencyManagement>
+
+ <pluginRepositories>
+ <!-- Black Duck plugin dependencies -->
+ <pluginRepository>
+ <id>JCenter</id>
+ <name>JCenter Repository</name>
+ <url>http://jcenter.bintray.com</url>
+ </pluginRepository>
+
+ </pluginRepositories>
<build>
<plugins>
@@ -147,42 +187,4 @@
</plugins>
</reporting>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>ansible-adapter-features</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>ansible-adapter-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
- </dependencies>
-
-
- </dependencyManagement>
-
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- </pluginRepositories>
-
- <modules>
- <module>ansible-adapter-bundle</module>
- <module>ansible-adapter-installer</module>
- </modules>
</project>