Fix docker build error for usecase-ui-server

Change-Id: I4f08e076216caeb7fb50bb9fe37a7acc4d58c5df
Issue-ID: USECASEUI-152
Signed-off-by: zhangab <zhanganbing@chinamobile.com>

diff --git a/pom.xml b/pom.xml
index 4594d82..5f0c2c8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.usecase-ui.server</groupId>
     <artifactId>usecase-ui-server-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>usecase-ui-server</name>
     <description>project for usecase-ui server</description>

diff --git a/server/pom.xml b/server/pom.xml
index bce8ca6..deb0c0a 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -19,13 +19,13 @@
     <parent>
         <groupId>org.onap.usecase-ui.server</groupId>
         <artifactId>usecase-ui-server-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.usecase-ui.server</groupId>
     <artifactId>usecase-ui-server</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>usecase-ui-server/server</name>
     <description>project for usecase-ui server</description>

diff --git a/standalone/pom.xml b/standalone/pom.xml
index c268cf1..ed689db 100644 (file)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.onap.usecase-ui.server</groupId>
         <artifactId>usecase-ui-server-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
         <linux64outputdir>target/assembly/${linux64}</linux64outputdir>
         <win64outputdir>target/assembly/${win64id}</win64outputdir>
         <version.output>target/version</version.output>
-        <usecaseui.version>1.1.1</usecaseui.version>
+        <usecaseui.version>1.2.0</usecaseui.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
@@ -118,6 +118,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
                 <executions>
                     <execution>
                         <id>copy-jar-${linux64id}</id>
@@ -130,7 +131,6 @@
                                 <artifactItem>
                                     <groupId>org.onap.usecase-ui.server</groupId>
                                     <artifactId>usecase-ui-server</artifactId>
-                                    <version>1.1.0-SNAPSHOT</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${linux64outputdir}</outputDirectory>
@@ -150,7 +150,6 @@
                                 <artifactItem>
                                     <groupId>org.onap.usecase-ui.server</groupId>
                                     <artifactId>usecase-ui-server</artifactId>
-                                    <version>1.1.0-SNAPSHOT</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${win64outputdir}</outputDirectory>

diff --git a/version.properties b/version.properties
index 55fbf44..faf06bb 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
-patch=1
+minor=2
+patch=0
 
 base_version=${major}.${minor}.${patch}