summaryrefslogtreecommitdiffstats
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
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>
-rwxr-xr-xaai-service/installer/pom.xml4
-rwxr-xr-xaai-service/pom.xml4
-rwxr-xr-xaai-service/provider/pom.xml21
-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
-rwxr-xr-xartifacts/pom.xml15
-rw-r--r--base/http/installer/pom.xml4
-rw-r--r--base/http/pom.xml4
-rw-r--r--base/http/provider/pom.xml4
-rw-r--r--base/pom.xml11
-rw-r--r--features/ccsdk-aai-service/pom.xml5
-rw-r--r--features/ccsdk-ansible-adapter/pom.xml6
-rw-r--r--features/ccsdk-base-http/pom.xml4
-rw-r--r--features/ccsdk-mdsal-resource/pom.xml5
-rwxr-xr-xfeatures/ccsdk-messagerouter-consumer/pom.xml8
-rwxr-xr-xfeatures/ccsdk-messagerouter-publisher/pom.xml8
-rw-r--r--features/ccsdk-netbox-client/pom.xml10
-rw-r--r--features/ccsdk-resource-assignment/pom.xml5
-rw-r--r--features/ccsdk-saltstack-adapter/pom.xml7
-rw-r--r--features/ccsdk-sli-adaptors-all/pom.xml4
-rw-r--r--features/ccsdk-sql-resource/pom.xml5
-rw-r--r--features/features-sli-adaptors/pom.xml4
-rwxr-xr-xfeatures/installer/pom.xml4
-rwxr-xr-xfeatures/pom.xml4
-rwxr-xr-xmdsal-resource/installer/pom.xml4
-rwxr-xr-xmdsal-resource/pom.xml6
-rwxr-xr-xmdsal-resource/provider/pom.xml18
-rwxr-xr-xmessage-router/consumer/api/pom.xml2
-rwxr-xr-xmessage-router/consumer/installer/pom.xml4
-rwxr-xr-xmessage-router/consumer/pom.xml2
-rwxr-xr-xmessage-router/consumer/provider/pom.xml2
-rwxr-xr-xmessage-router/pom.xml6
-rwxr-xr-xmessage-router/publisher/api/pom.xml2
-rw-r--r--message-router/publisher/installer/pom.xml4
-rwxr-xr-xmessage-router/publisher/pom.xml2
-rwxr-xr-xmessage-router/publisher/provider/pom.xml2
-rwxr-xr-xmessage-router/publisher/sample.client/pom.xml2
-rwxr-xr-xnetbox-client/installer/pom.xml4
-rw-r--r--netbox-client/pom.xml4
-rw-r--r--netbox-client/provider/pom.xml22
-rwxr-xr-xpom.xml85
-rwxr-xr-xresource-assignment/installer/pom.xml4
-rwxr-xr-xresource-assignment/pom.xml6
-rwxr-xr-xresource-assignment/provider/pom.xml20
-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
-rwxr-xr-xsql-resource/installer/pom.xml4
-rwxr-xr-xsql-resource/pom.xml5
-rwxr-xr-xsql-resource/provider/pom.xml17
-rw-r--r--version.properties6
52 files changed, 301 insertions, 324 deletions
diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml
index baf41865f..6a0d99097 100755
--- a/aai-service/installer/pom.xml
+++ b/aai-service/installer/pom.xml
@@ -5,13 +5,13 @@
<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>aai-service-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
diff --git a/aai-service/pom.xml b/aai-service/pom.xml
index c5167d507..e96f57540 100755
--- a/aai-service/pom.xml
+++ b/aai-service/pom.xml
@@ -5,13 +5,13 @@
<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>aai-service</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: aai-service</name>
diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index 082fcaab5..0f564e858 100755
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -5,13 +5,13 @@
<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>aai-service-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
@@ -20,19 +20,18 @@
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<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>
+ <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>junit</groupId>
@@ -53,7 +52,7 @@
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -109,7 +108,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.14.0</version>
+ <version>0.14.0</version>
<executions>
<execution>
<id>gen-xjc</id>
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>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 966417619..53a8fbe10 100755
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -2,9 +2,15 @@
<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>parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>sli-adaptors-artifacts</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: sli-adaptors-artifacts</name>
@@ -14,12 +20,6 @@
<name>ONAP</name>
</organization>
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>parent</artifactId>
- <version>1.5.2</version>
- </parent>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -143,5 +143,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
</project>
diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml
index a8397faf3..4940c55c9 100644
--- a/base/http/installer/pom.xml
+++ b/base/http/installer/pom.xml
@@ -5,13 +5,13 @@
<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>base-http-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
diff --git a/base/http/pom.xml b/base/http/pom.xml
index fda2c83f9..e72441db5 100644
--- a/base/http/pom.xml
+++ b/base/http/pom.xml
@@ -5,13 +5,13 @@
<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.base</groupId>
<artifactId>http</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml
index b7002e521..6aab259b4 100644
--- a/base/http/provider/pom.xml
+++ b/base/http/provider/pom.xml
@@ -5,13 +5,13 @@
<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>base-http-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
diff --git a/base/pom.xml b/base/pom.xml
index 120bbc35e..364fd7878 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -1,21 +1,20 @@
<?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/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>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>base-parent</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<modules>
<module>http</module>
</modules>
-
</project>
diff --git a/features/ccsdk-aai-service/pom.xml b/features/ccsdk-aai-service/pom.xml
index 983f22461..f91e58502 100644
--- a/features/ccsdk-aai-service/pom.xml
+++ b/features/ccsdk-aai-service/pom.xml
@@ -5,18 +5,17 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-aai-service</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
-
<properties>
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
diff --git a/features/ccsdk-ansible-adapter/pom.xml b/features/ccsdk-ansible-adapter/pom.xml
index ee66e2a70..32ec5058f 100644
--- a/features/ccsdk-ansible-adapter/pom.xml
+++ b/features/ccsdk-ansible-adapter/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-ansible-adapter</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name>
@@ -29,7 +29,7 @@
<version>${ccsdk.sli.core.version}</version>
<type>xml</type>
<classifier>features</classifier>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/features/ccsdk-base-http/pom.xml b/features/ccsdk-base-http/pom.xml
index 002c14c21..a38fa4c73 100644
--- a/features/ccsdk-base-http/pom.xml
+++ b/features/ccsdk-base-http/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-base-http</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
diff --git a/features/ccsdk-mdsal-resource/pom.xml b/features/ccsdk-mdsal-resource/pom.xml
index 8af9fa9b6..e3ef74a05 100644
--- a/features/ccsdk-mdsal-resource/pom.xml
+++ b/features/ccsdk-mdsal-resource/pom.xml
@@ -5,18 +5,17 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-mdsal-resource</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
-
<properties>
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
diff --git a/features/ccsdk-messagerouter-consumer/pom.xml b/features/ccsdk-messagerouter-consumer/pom.xml
index 8e2766bc5..47fc35316 100755
--- a/features/ccsdk-messagerouter-consumer/pom.xml
+++ b/features/ccsdk-messagerouter-consumer/pom.xml
@@ -5,14 +5,14 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>ccsdk-messagerouter-consumer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -25,6 +25,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
-
</project>
diff --git a/features/ccsdk-messagerouter-publisher/pom.xml b/features/ccsdk-messagerouter-publisher/pom.xml
index 1b3b702cb..ef3f13649 100755
--- a/features/ccsdk-messagerouter-publisher/pom.xml
+++ b/features/ccsdk-messagerouter-publisher/pom.xml
@@ -5,14 +5,14 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>ccsdk-messagerouter-publisher</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -25,6 +25,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
-
</project>
diff --git a/features/ccsdk-netbox-client/pom.xml b/features/ccsdk-netbox-client/pom.xml
index 29f90b3c4..28e672350 100644
--- a/features/ccsdk-netbox-client/pom.xml
+++ b/features/ccsdk-netbox-client/pom.xml
@@ -20,24 +20,22 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-netbox-client</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: netbox-client :: ${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>
@@ -46,7 +44,7 @@
<version>${ccsdk.sli.core.version}</version>
<type>xml</type>
<classifier>features</classifier>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -55,7 +53,7 @@
<version>${ccsdk.sli.core.version}</version>
<type>xml</type>
<classifier>features</classifier>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/features/ccsdk-resource-assignment/pom.xml b/features/ccsdk-resource-assignment/pom.xml
index 0048a7e18..1672c6c21 100644
--- a/features/ccsdk-resource-assignment/pom.xml
+++ b/features/ccsdk-resource-assignment/pom.xml
@@ -5,18 +5,17 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-resource-assignment</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
-
<properties>
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index 1c4014096..ffc43e152 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-saltstack-adapter</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
@@ -35,5 +35,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
</project>
diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml
index bce028866..53664b4ed 100644
--- a/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/features/ccsdk-sli-adaptors-all/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-sli-adaptors-all</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
diff --git a/features/ccsdk-sql-resource/pom.xml b/features/ccsdk-sql-resource/pom.xml
index 2dfa36f72..8b553c0ce 100644
--- a/features/ccsdk-sql-resource/pom.xml
+++ b/features/ccsdk-sql-resource/pom.xml
@@ -5,18 +5,17 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-sql-resource</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
-
<properties>
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml
index 5f2fbc578..4c9c862b8 100644
--- a/features/features-sli-adaptors/pom.xml
+++ b/features/features-sli-adaptors/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>features-sli-adaptors</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 23205e69a..036cc9a5d 100755
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -5,13 +5,13 @@
<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>sliadaptors-features-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
diff --git a/features/pom.xml b/features/pom.xml
index 2c93658cb..2c4d8098c 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,13 +5,13 @@
<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>sliadaptors-feature-aggregator</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: features</name>
diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml
index dce634d05..d78bec957 100755
--- a/mdsal-resource/installer/pom.xml
+++ b/mdsal-resource/installer/pom.xml
@@ -5,13 +5,13 @@
<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>mdsal-resource-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index de34cd2e8..36ea6e83e 100755
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/pom.xml
@@ -5,13 +5,13 @@
<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>mdsal-resource</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: mdsal-resource</name>
@@ -21,6 +21,4 @@
<module>provider</module>
<module>installer</module>
</modules>
-
-
</project>
diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml
index 32f0a66f1..3da2dc241 100755
--- a/mdsal-resource/provider/pom.xml
+++ b/mdsal-resource/provider/pom.xml
@@ -5,13 +5,13 @@
<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>mdsal-resource-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
@@ -22,19 +22,18 @@
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<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>
+ <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>
@@ -80,5 +79,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/message-router/consumer/api/pom.xml b/message-router/consumer/api/pom.xml
index 117e60093..70dd0408e 100755
--- a/message-router/consumer/api/pom.xml
+++ b/message-router/consumer/api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>consumer.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>consumer.api</artifactId>
diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml
index 345b50fe7..465550386 100755
--- a/message-router/consumer/installer/pom.xml
+++ b/message-router/consumer/installer/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>consumer.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>consumer.installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml
index 5b67ca4b0..56586eae8 100755
--- a/message-router/consumer/pom.xml
+++ b/message-router/consumer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>messagerouter-root</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>consumer.aggregate</artifactId>
diff --git a/message-router/consumer/provider/pom.xml b/message-router/consumer/provider/pom.xml
index f3ccafa74..1e69ad150 100755
--- a/message-router/consumer/provider/pom.xml
+++ b/message-router/consumer/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>consumer.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>consumer.provider</artifactId>
diff --git a/message-router/pom.xml b/message-router/pom.xml
index 09d47afc4..5fe29e144 100755
--- a/message-router/pom.xml
+++ b/message-router/pom.xml
@@ -2,16 +2,16 @@
<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>
+ <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.messagerouter</groupId>
<artifactId>messagerouter-root</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/message-router/publisher/api/pom.xml b/message-router/publisher/api/pom.xml
index c4831f482..0532ed77e 100755
--- a/message-router/publisher/api/pom.xml
+++ b/message-router/publisher/api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>publisher.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>publisher.api</artifactId>
diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml
index 792e3c05b..b700fa878 100644
--- a/message-router/publisher/installer/pom.xml
+++ b/message-router/publisher/installer/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>publisher.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>publisher.installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml
index 487591fe5..0e069c6ac 100755
--- a/message-router/publisher/pom.xml
+++ b/message-router/publisher/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>messagerouter-root</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>publisher.aggregate</artifactId>
diff --git a/message-router/publisher/provider/pom.xml b/message-router/publisher/provider/pom.xml
index 456307764..c1fbf274d 100755
--- a/message-router/publisher/provider/pom.xml
+++ b/message-router/publisher/provider/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>publisher.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>publisher.provider</artifactId>
diff --git a/message-router/publisher/sample.client/pom.xml b/message-router/publisher/sample.client/pom.xml
index 47692aad7..bcdd14d54 100755
--- a/message-router/publisher/sample.client/pom.xml
+++ b/message-router/publisher/sample.client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
<artifactId>publisher.aggregate</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>sample.client</artifactId>
diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml
index 93e005673..e2be415ca 100755
--- a/netbox-client/installer/pom.xml
+++ b/netbox-client/installer/pom.xml
@@ -20,13 +20,13 @@
<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>netbox-client-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml
index 6051f2ce9..da901ae9c 100644
--- a/netbox-client/pom.xml
+++ b/netbox-client/pom.xml
@@ -20,13 +20,13 @@
<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>netbox-client</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: netbox-client</name>
diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml
index cef1f05da..19080bcda 100644
--- a/netbox-client/provider/pom.xml
+++ b/netbox-client/provider/pom.xml
@@ -15,19 +15,19 @@
limitations under the License.
-->
<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>netbox-client-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <modelVersion>4.0.0</modelVersion>
<name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
@@ -39,15 +39,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>
@@ -77,7 +76,7 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sliPluginUtils-provider</artifactId>
- <version>${ccsdk.sli.core.version}</version>
+ <version>${ccsdk.sli.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -102,7 +101,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
- <version>2.23.2</version>
+ <version>2.23.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -135,5 +134,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/pom.xml b/pom.xml
index 2bf3026b4..101c6779e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,27 +1,38 @@
<?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/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>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-sli-adaptors</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>ccsdk-sli-adaptors</name>
- <url>https://wiki.onap.org</url>
<description>The CCSDK core components contains the SLI, dblib and root pom</description>
+ <url>https://wiki.onap.org</url>
+ <organization>
+ <name>ONAP</name>
+ </organization>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://jira.onap.org/</url>
- </issueManagement>
-
+ <modules>
+ <module>aai-service</module>
+ <module>ansible-adapter</module>
+ <module>saltstack-adapter</module>
+ <module>netbox-client</module>
+ <module>mdsal-resource</module>
+ <module>resource-assignment</module>
+ <module>sql-resource</module>
+ <module>base</module>
+ <module>message-router</module>
+ <module>features</module>
+ <module>artifacts</module>
+ </modules>
<scm>
<connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors</connection>
@@ -29,12 +40,14 @@
<url>${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors</url>
<tag>ccsdk-adaptors-${project.version}</tag>
</scm>
-
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://jira.onap.org/</url>
+ </issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://jenkins.onap.org/</url>
</ciManagement>
-
<distributionManagement>
<site>
<id>sdnc-javadoc</id>
@@ -44,6 +57,19 @@
</site>
</distributionManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>blackduck</id>
@@ -125,37 +151,4 @@
</profile>
</profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
- <modules>
- <module>aai-service</module>
- <module>ansible-adapter</module>
- <module>saltstack-adapter</module>
- <module>netbox-client</module>
- <module>mdsal-resource</module>
- <module>resource-assignment</module>
- <module>sql-resource</module>
- <module>base</module>
- <module>message-router</module>
- <module>features</module>
- <module>artifacts</module>
- </modules>
- <organization>
- <name>ONAP</name>
- </organization>
- <version>0.7.1-SNAPSHOT</version>
-
-
</project>
diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 2dce577c6..ebfc5e518 100755
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -5,13 +5,13 @@
<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>resource-assignment-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index e1eff0029..3c3fab354 100755
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -5,13 +5,13 @@
<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>resource-assignment</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment</name>
@@ -21,6 +21,4 @@
<module>provider</module>
<module>installer</module>
</modules>
-
-
</project>
diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index 862370886..cc6043a70 100755
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/provider/pom.xml
@@ -5,13 +5,13 @@
<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>resource-assignment-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
@@ -22,20 +22,18 @@
<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
<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>
+ <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>junit</groupId>
@@ -91,6 +89,4 @@
<artifactId>spring-jdbc</artifactId>
</dependency>
</dependencies>
-
-
</project>
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>
diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml
index 94cc33ae4..e518767b6 100755
--- a/sql-resource/installer/pom.xml
+++ b/sql-resource/installer/pom.xml
@@ -5,13 +5,13 @@
<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>sql-resource-installer</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml
index 58a72ab49..3fcf5e4e6 100755
--- a/sql-resource/pom.xml
+++ b/sql-resource/pom.xml
@@ -5,13 +5,13 @@
<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>sql-resource</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: sql-resource</name>
@@ -21,5 +21,4 @@
<module>provider</module>
<module>installer</module>
</modules>
-
</project>
diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml
index 7be4fc110..90e0224bb 100755
--- a/sql-resource/provider/pom.xml
+++ b/sql-resource/provider/pom.xml
@@ -5,13 +5,13 @@
<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>sql-resource-provider</artifactId>
- <version>0.7.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
@@ -26,15 +26,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>junit</groupId>
@@ -82,6 +81,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
-
</project>
diff --git a/version.properties b/version.properties
index c11ada9fe..feea7088f 100644
--- a/version.properties
+++ b/version.properties
@@ -3,9 +3,9 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-release_name=0
-sprint_number=7
-feature_revision=1
+release_name=1
+sprint_number=0
+feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}