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

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
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 (file)
--- 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">\r
        <modelVersion>4.0.0</modelVersion>\r
 \r
-       <parent>\r
-               <groupId>org.onap.oparent</groupId>\r
-               <artifactId>oparent</artifactId>\r
-               <version>1.2.0</version>\r
-       </parent>\r
+    <parent>\r
+        <groupId>org.onap.optf.cmso</groupId>\r
+        <artifactId>cmso</artifactId>\r
+        <version>1.0.1-SNAPSHOT</version>\r
+    </parent>\r
 \r
        <groupId>org.onap.optf.cmso</groupId>\r
        <artifactId>liquibase</artifactId>\r
-       <version>1.0.0-SNAPSHOT</version>\r
 \r
        <name>liquibase</name>\r
        <description>Liquibase project for Spring Boot</description>\r
@@ -58,8 +57,8 @@
                <serviceArtifactName>liquibase</serviceArtifactName>\r
 \r
                <java.version>1.8</java.version>\r
-               <spring.version>5.0.8.RELEASE</spring.version>\r
-               <spring.boot.version>2.0.4.RELEASE</spring.boot.version>\r
+        <spring.version>5.0.10.RELEASE</spring.version>\r
+               <spring.boot.version>2.0.6.RELEASE</spring.boot.version>\r
 \r
                <maven.compiler.target>1.8</maven.compiler.target>\r
                <maven.compiler.source>1.8</maven.compiler.source>\r

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 9916b27..ff72c1c 100644 (file)
--- 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">\r
        <modelVersion>4.0.0</modelVersion>\r
 \r
-       <parent>\r
-               <groupId>org.onap.oparent</groupId>\r
-               <artifactId>oparent</artifactId>\r
-               <version>1.2.0</version>\r
-       </parent>\r
+    <parent>\r
+        <groupId>org.onap.optf.cmso</groupId>\r
+        <artifactId>cmso</artifactId>\r
+        <version>1.0.1-SNAPSHOT</version>\r
+    </parent>\r
 \r
        <groupId>org.onap.optf.cmso</groupId>\r
        <artifactId>cmso-service</artifactId>\r
-       <version>1.0.0-SNAPSHOT</version>\r
+\r
        <packaging>jar</packaging>\r
 \r
        <name>cmso</name>\r
@@ -62,8 +62,8 @@
                <java.version>1.8</java.version>\r
                <eelf.version>1.0.0</eelf.version>\r
                <pact.version>3.3.9</pact.version>\r
-               <spring.version>5.0.8.RELEASE</spring.version>\r
-               <spring.boot.version>2.0.4.RELEASE</spring.boot.version>\r
+        <spring.version>5.0.10.RELEASE</spring.version>\r
+               <spring.boot.version>2.0.6.RELEASE</spring.boot.version>\r
                <springfox.swagger2.version>2.9.2</springfox.swagger2.version>\r
 \r
                <maven.compiler.target>1.8</maven.compiler.target>\r
@@ -282,6 +282,7 @@
                        <groupId>org.jacoco</groupId>\r
                        <artifactId>jacoco-maven-plugin</artifactId>\r
                        <version>0.8.1</version>\r
+            <scope>test</scope>\r
                </dependency>\r
        </dependencies>\r
 \r

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 (file)
--- 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 (file)
--- 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">\r
        <modelVersion>4.0.0</modelVersion>\r
 \r
+       <parent>\r
+               <groupId>org.onap.oparent</groupId>\r
+               <artifactId>oparent</artifactId>\r
+               <version>1.2.1</version>\r
+       </parent>\r
+\r
        <groupId>org.onap.optf.cmso</groupId>\r
        <artifactId>cmso</artifactId>\r
-       <version>0.1.0-SNAPSHOT</version>\r
+       <version>1.0.1-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
        \r
        <name>optf-cmso</name>\r
@@ -60,61 +66,6 @@
         <module>cmso-database</module>\r
     </modules>\r
 \r
-       <distributionManagement>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>CMSO Release Repository</name>\r
-                       <url>https://nexus.onap.org/content/repositories/releases/</url>\r
-               </repository>\r
-               <snapshotRepository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>CMSO Snapshot Repository</name>\r
-                       <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-               </snapshotRepository>\r
-               <site>\r
-                       <id>ecomp-site</id>\r
-                       <url>dav:https://nexus.onap.org/content/sites/site/org/onap/cmso/${project.version}</url>\r
-               </site>\r
-       </distributionManagement>\r
-\r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>ONAP Release Repository</name>\r
-                       <url>https://nexus.onap.org/content/repositories/releases/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-staging</id>\r
-                       <name>ONAP Staging Repository</name>\r
-                       <url>https://nexus.onap.org/content/repositories/staging/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>ONAP Snapshot Repository</name>\r
-                       <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-                       <snapshots>\r
-                               <enabled>true</enabled>\r
-                       </snapshots>\r
-                       <releases>\r
-                               <enabled>false</enabled>\r
-                       </releases>\r
-               </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
        <build> \r
                <pluginManagement> \r
                        <plugins> \r

diff --git a/version.properties b/version.properties
index 3e0ea3f..d7f1f37 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}