Merge "Creating version 2.0 for Dublin"

8 files changed, 27 insertions, 26 deletions

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index b820acb..86ac3c4 100644
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -36,7 +36,7 @@
     <parent>

         <groupId>org.onap.optf.cmso</groupId>

         <artifactId>cmso</artifactId>

-        <version>1.0.1-SNAPSHOT</version>

+        <version>2.0.0-SNAPSHOT</version>

     </parent>

 

 	<groupId>org.onap.optf.cmso</groupId>

@@ -46,26 +46,14 @@
 	<description>Liquibase project for Spring Boot</description>

 

 	<properties>

-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

-	

-		<cmso.project.version>${project.version}</cmso.project.version>

-		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>

 

 		<service.name>liquibase</service.name>

-		<release-tag>Casablanca</release-tag>

-		<name.space>org.onap.optf</name.space>

 		<serviceArtifactName>liquibase</serviceArtifactName>

 

-		<java.version>1.8</java.version>

-        <spring.version>5.1.5.RELEASE</spring.version>

-		<spring.boot.version>2.1.3.RELEASE</spring.boot.version>

 

-		<maven.compiler.target>1.8</maven.compiler.target>

-		<maven.compiler.source>1.8</maven.compiler.source>

 		<build.number>${maven.build.timestamp}</build.number>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

 		

 		<docker.push.registry>localhost:5000</docker.push.registry>

 		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>

diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index 4281cf7..1371805 100644
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.onap.optf.cmso</groupId>
 		<artifactId>cmso</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.optf.cmso.optimizer</groupId>
diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml
index 8146afd..074d046 100644
--- a/cmso-robot/pom.xml
+++ b/cmso-robot/pom.xml
@@ -24,7 +24,7 @@
 	<parent>

 		<groupId>org.onap.optf.cmso</groupId>

 		<artifactId>cmso</artifactId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>2.0.0-SNAPSHOT</version>

 	</parent>

 

 	<groupId>org.onap.optf.cmso</groupId>

@@ -39,8 +39,8 @@
 		<cmso.project.version>${project.version}</cmso.project.version>

 		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>

 

+		<release-tag>Dublin</release-tag>

 		<service.name>cmso-robot</service.name>

-		<release-tag>Casablanca</release-tag>

 		<name.space>org.onap.optf</name.space>

 		<serviceArtifactName>cmso-robot</serviceArtifactName>

 

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 05c7962..bdd7dde 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -30,7 +30,7 @@
 	<parent>

 		<groupId>org.onap.optf.cmso</groupId>

 		<artifactId>cmso</artifactId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>2.0.0-SNAPSHOT</version>

 	</parent>

 

 	<groupId>org.onap.optf.cmso.service</groupId>

@@ -46,8 +46,8 @@
 		<cmso.project.version>${project.version}</cmso.project.version>

 		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>

 

+		<release-tag>Dublin</release-tag>

 		<service.name>cmso</service.name>

-		<release-tag>Casablanca</release-tag>

 		<name.space>org.onap.optf.cmso</name.space>

 		<serviceArtifactName>cmso</serviceArtifactName>

 

diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index b5d22d8..c98e691 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -24,7 +24,7 @@
 	<parent>

 		<groupId>org.onap.optf.cmso</groupId>

 		<artifactId>cmso</artifactId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>2.0.0-SNAPSHOT</version>

 	</parent>

 

 	<groupId>org.onap.optf.cmso.sonar</groupId>

@@ -39,7 +39,7 @@
 		<cmso.project.version>${project.version}</cmso.project.version>

 		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>

 

-		<service.name>cmso-robot</service.name>

+		<service.name>cmso-sonar</service.name>

 		<release-tag>Dublin</release-tag>

 		<name.space>org.onap.optf</name.space>

 		<serviceArtifactName>cmso-sonar</serviceArtifactName>

diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml
index 4910ec4..9a636b9 100644
--- a/cmso-ticketmgt/pom.xml
+++ b/cmso-ticketmgt/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.onap.optf.cmso</groupId>
 		<artifactId>cmso</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.optf.cmso.ticketmgt</groupId>
@@ -34,9 +34,8 @@
 
 		<cmso.project.version>${project.version}</cmso.project.version>
 		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>
-
+		<release-tag>Dublin</release-tag>
 		<service.name>cmso</service.name>
-		<release-tag>Casablanca</release-tag>
 		<name.space>org.onap.optf.cmso</name.space>
 		<serviceArtifactName>cmso</serviceArtifactName>
 
diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml
index 19ea398..c0de88b 100644
--- a/cmso-topology/pom.xml
+++ b/cmso-topology/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.onap.optf.cmso</groupId>
 		<artifactId>cmso</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.optf.cmso.topology</groupId>
@@ -35,8 +35,8 @@
 		<cmso.project.version>${project.version}</cmso.project.version>
 		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>
 
+		<release-tag>Dublin</release-tag>
 		<service.name>cmso</service.name>
-		<release-tag>Casablanca</release-tag>
 		<name.space>org.onap.optf.cmso</name.space>
 		<serviceArtifactName>cmso</serviceArtifactName>
 
diff --git a/pom.xml b/pom.xml
index c9cae2c..2435e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 

 	<groupId>org.onap.optf.cmso</groupId>

 	<artifactId>cmso</artifactId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>2.0.0-SNAPSHOT</version>

 	<packaging>pom</packaging>

 	

 	<name>optf-cmso</name>

@@ -54,6 +54,20 @@
         <url>https://jira.onap.org/</url>

     </issueManagement>

 

+	<properties>

+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

+		<cmso.project.version>${project.version}</cmso.project.version>

+		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>

+		<release-tag>Dublin</release-tag>

+		<java.version>1.8</java.version>

+		<maven.compiler.target>1.8</maven.compiler.target>

+		<maven.compiler.source>1.8</maven.compiler.source>

+        <spring.version>5.1.5.RELEASE</spring.version>

+		<spring.boot.version>2.1.3.RELEASE</spring.boot.version>

+		<release-tag>Dublin</release-tag>

+		<name.space>org.onap.optf</name.space>

+	</properties>

+	

     <scm>

         <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors</connection>

         <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/optf/cmso</developerConnection>