JJB alignment across DCAE components - DCAE-Servicechange Handler

Issue-ID: DCAEGEN2-1578

Signed-off-by: Gerard Hickey <gerard.hickey@ericsson.com>
Change-Id: I28ce5ff2cd9b5999fdaa4de4c770e3dd31bd74de

diff --git a/pom.xml b/pom.xml
index bdd2703..05c7056 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
 
 
     <groupId>org.onap.dcaegen2.platform</groupId>
     <artifactId>servicechange-handler</artifactId>
-    <version>1.1.5</version>
+    <version>1.2.0</version>
     <!-- Not sure why clojure-maven-plugin says packaging should be "clojure" -->
     <packaging>jar</packaging>
 
@@ -122,7 +122,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                             <classpathPrefix>dependency</classpathPrefix>
                         </manifest>
                     </archive>
-                    <finalName>${project.artifactId}</finalName>                   
+                    <finalName>${project.artifactId}</finalName>
                 </configuration>
             </plugin>
             <!-- Used to copy in the dependencies when packaging JAR -->

diff --git a/version.properties b/version.properties
index dba81ff..00ef564 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
-major=1\r
-minor=1\r
-patch=5\r
-base_version=${major}.${minor}.${patch}\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT\r
+major=1
+minor=2
+patch=0
+base_version=${major}.${minor}.${patch}
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT