summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-05-01 11:26:58 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-05-01 11:27:03 -0400
commit60a9cf44813b622d5cad1bfad0034ee0dce3f444 (patch)
tree932e04a2fbfdbb3acb55d775129eb4bd2b94b10e
parent5f7f020b9c40da52a09f588f642dfcec13e6fc4c (diff)
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>
-rw-r--r--policy-base/alpine/pom.xml2
-rw-r--r--policy-base/pom.xml2
-rw-r--r--policy-common/alpine/pom.xml2
-rw-r--r--policy-common/pom.xml2
-rw-r--r--pom.xml5
-rw-r--r--version.properties2
6 files changed, 8 insertions, 7 deletions
diff --git a/policy-base/alpine/pom.xml b/policy-base/alpine/pom.xml
index 3027fb29..f8fa16b6 100644
--- 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 dd046613..06d964fa 100644
--- 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 cd6ce9de..45bb3b07 100644
--- 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 a17a1bb5..02713573 100644
--- 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 18a433b8..9e0b2ae0 100644
--- 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 668657e9..eff345ce 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=1
minor=4
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}