Upgrade parent and bump snapshot

The version for this wasn't quite correct either. Fixed to
ensure follows the 1.4.x as defined in version.properties.

Updated to point to policy/parent release version and remove
warning for relative path.

Issue-ID: POLICY-1700
Change-Id: I6772a272f3f291af5fd6ee9efc3f10b0ac3edfd1
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/policy-base/alpine/pom.xml b/policy-base/alpine/pom.xml
index 3027fb2..f8fa16b 100644 (file)
--- a/policy-base/alpine/pom.xml
+++ b/policy-base/alpine/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>policy-base</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

diff --git a/policy-base/pom.xml b/policy-base/pom.xml
index dd04661..06d964f 100644 (file)
--- a/policy-base/pom.xml
+++ b/policy-base/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>docker</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-base</artifactId>

diff --git a/policy-common/alpine/pom.xml b/policy-common/alpine/pom.xml
index cd6ce9d..45bb3b0 100644 (file)
--- a/policy-common/alpine/pom.xml
+++ b/policy-common/alpine/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>policy-common</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

diff --git a/policy-common/pom.xml b/policy-common/pom.xml
index a17a1bb..0271357 100644 (file)
--- a/policy-common/pom.xml
+++ b/policy-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>docker</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-common</artifactId>

diff --git a/pom.xml b/pom.xml
index 18a433b..9e0b2ae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.policy.docker</groupId>
     <artifactId>docker</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>Policy Docker images</name>

diff --git a/version.properties b/version.properties
index 668657e..eff345c 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}