summaryrefslogtreecommitdiffstats
path: root/saltstack-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 /saltstack-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 'saltstack-adapter')
-rw-r--r--saltstack-adapter/pom.xml100
-rw-r--r--saltstack-adapter/saltstack-adapter-installer/pom.xml14
-rw-r--r--saltstack-adapter/saltstack-adapter-provider/pom.xml20
3 files changed, 71 insertions, 63 deletions
diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml
index 62e1720ac..da1b6095c 100644
--- a/saltstack-adapter/pom.xml
+++ b/saltstack-adapter/pom.xml
@@ -22,22 +22,69 @@
============LICENSE_END=========================================================
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>saltstack-adaptor</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<name>ccsdk-sli-adaptors :: saltstack-adapter</name>
<description>Abstractions to interact with Saltstack server via REST
</description>
- <packaging>pom</packaging>
+
+ <modules>
+ <module>saltstack-adapter-provider</module>
+ <module>saltstack-adapter-installer</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>saltstack-adapter-features</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>saltstack-adapter-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </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>
@@ -148,49 +195,4 @@
</plugins>
</reporting>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>saltstack-adapter-features</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>saltstack-adapter-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </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>saltstack-adapter-provider</module>
- <module>saltstack-adapter-installer</module>
- </modules>
</project>
diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index 334aafad2..a0f37d18f 100644
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -22,20 +22,24 @@
============LICENSE_END=========================================================
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>odlparent-lite</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
+
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>saltstack-adapter-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
</name>
- <packaging>pom</packaging>
+
<properties>
<application.name>ccsdk-saltstack-adapter</application.name>
<features.boot>${application.name}</features.boot>
@@ -44,6 +48,7 @@
</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
+
<dependencies>
<dependency>
@@ -53,6 +58,7 @@
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml
index ffaf8033a..eb7788d94 100644
--- a/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -11,19 +11,21 @@
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. ============LICENSE_END========================================================= -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>saltstack-adapter-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+
<name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
</name>
@@ -35,15 +37,14 @@
<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>
+ <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>
@@ -116,5 +117,4 @@
</dependency>
</dependencies>
-
</project>