From 2fee92d507c77890b093ad76d693eebc1f06be65 Mon Sep 17 00:00:00 2001
From: vrvarma <vv8305@att.com>
Date: Sun, 4 Nov 2018 17:29:01 -0500
Subject: [PATCH] Increment release version for cmso

Fix CLM security violations in pom.xml
Fix pom.xml structure to deploy release builds.

Change-Id: Ie3c0bec95dc753bc8d13e694fae0fb5ac8f389ac
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-395
---
 .gitignore                                         |  4 ++
 cmso-database/pom.xml                              | 15 +++---
 cmso-service/pom.xml                               | 17 +++---
 .../main/resources/swagger-ui/dist/swagger.json    |  2 +-
 pom.xml                                            | 63 +++-------------------
 version.properties                                 |  2 +-
 6 files changed, 29 insertions(+), 74 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..46df308
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.idea
+debug-logs
+logs
+target
diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index 23f38cb..33fc812 100644
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -33,15 +33,14 @@
 	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.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>1.2.0</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.optf.cmso</groupId>
+        <artifactId>cmso</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+    </parent>
 
 	<groupId>org.onap.optf.cmso</groupId>
 	<artifactId>liquibase</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 
 	<name>liquibase</name>
 	<description>Liquibase project for Spring Boot</description>
@@ -58,8 +57,8 @@
 		<serviceArtifactName>liquibase</serviceArtifactName>
 
 		<java.version>1.8</java.version>
-		<spring.version>5.0.8.RELEASE</spring.version>
-		<spring.boot.version>2.0.4.RELEASE</spring.boot.version>
+        <spring.version>5.0.10.RELEASE</spring.version>
+		<spring.boot.version>2.0.6.RELEASE</spring.boot.version>
 
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 9916b27..ff72c1c 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -35,15 +35,15 @@
 	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.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>1.2.0</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.optf.cmso</groupId>
+        <artifactId>cmso</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+    </parent>
 
 	<groupId>org.onap.optf.cmso</groupId>
 	<artifactId>cmso-service</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+
 	<packaging>jar</packaging>
 
 	<name>cmso</name>
@@ -62,8 +62,8 @@
 		<java.version>1.8</java.version>
 		<eelf.version>1.0.0</eelf.version>
 		<pact.version>3.3.9</pact.version>
-		<spring.version>5.0.8.RELEASE</spring.version>
-		<spring.boot.version>2.0.4.RELEASE</spring.boot.version>
+        <spring.version>5.0.10.RELEASE</spring.version>
+		<spring.boot.version>2.0.6.RELEASE</spring.boot.version>
 		<springfox.swagger2.version>2.9.2</springfox.swagger2.version>
 
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -282,6 +282,7 @@
 			<groupId>org.jacoco</groupId>
 			<artifactId>jacoco-maven-plugin</artifactId>
 			<version>0.8.1</version>
+            <scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/cmso-service/src/main/resources/swagger-ui/dist/swagger.json b/cmso-service/src/main/resources/swagger-ui/dist/swagger.json
index 751b276..932f786 100644
--- a/cmso-service/src/main/resources/swagger-ui/dist/swagger.json
+++ b/cmso-service/src/main/resources/swagger-ui/dist/swagger.json
@@ -1,7 +1,7 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "1.0.0-SNAPSHOT",
+    "version" : "1.0.1-SNAPSHOT",
     "title" : "cmso-service"
   },
   "basePath" : "/cmso",
diff --git a/pom.xml b/pom.xml
index d3c0faa..e8e6f14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,9 +35,15 @@
 	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.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.2.1</version>
+	</parent>
+
 	<groupId>org.onap.optf.cmso</groupId>
 	<artifactId>cmso</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>optf-cmso</name>
@@ -60,61 +66,6 @@
         <module>cmso-database</module>
     </modules>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>CMSO Release Repository</name>
-			<url>https://nexus.onap.org/content/repositories/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>CMSO Snapshot Repository</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots/</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:https://nexus.onap.org/content/sites/site/org/onap/cmso/${project.version}</url>
-		</site>
-	</distributionManagement>
-
-	<repositories>
-		<repository>
-			<id>central</id>
-			<name>Maven 2 repository 2</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ONAP Release Repository</name>
-			<url>https://nexus.onap.org/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>ONAP Staging Repository</name>
-			<url>https://nexus.onap.org/content/repositories/staging/</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>ONAP Snapshot Repository</name>
-			<url>https://nexus.onap.org/content/repositories/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>spring-repo</id>
-			<name>Spring repo</name>
-			<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-		</repository>
-		<repository>
-			<id>repository.jboss.org-public</id>
-			<name>JBoss.org Maven repository</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public</url>
-		</repository>
-	</repositories>
 	<build> 
 		<pluginManagement> 
 			<plugins> 
diff --git a/version.properties b/version.properties
index 3e0ea3f..d7f1f37 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6