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>
diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index 082fcaa..0f564e8 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>