Upgrade SNAPSHOT to 1.2.2

These reviews must be merged in order because of layering.

This review should be merged SECOND

Note: In order to get past the following layering problems, there
are temporary chages to the following POMs to temporarily use 1.2.1-SNAPSHOT
for those dependencies. They are
ONAP-PAP-REST/pom.xml
 org.onap.policy.drools-applications.controlloop.common.policy-yaml
ONAP-PDP/pom.xml
 org.onap.policy.drools-pdp.policy-endpoints

A separate review will be used to restore these dependencies to 1.2.2-SNAPSHOT
once the drools-pdp and drools-applications reviews are submitted and merged

PLD added version.properties

Issue-ID: POLICY-798
Change-Id: Id7e83f2ba12181c63cc8845b7eeccf2004d2bab9
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 7b562bf..081d308 100644 (file)
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,6 +77,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.2.1-SNAPSHOT
+brms.dependency.version=1.2.2
 
 ENVIRONMENT = DEVL

diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index 906d345..aa200f1 100644 (file)
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -3,96 +3,96 @@
         "default": [{
             "groupId": "org.onap.policy.drools-applications.controlloop.templates",
             "artifactId": "template.demo",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "events",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "rest",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appc",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "aai",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "so",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "trafficgenerator",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }],
         "amsterdam": [{
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "events",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appc",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appclcm",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "vfc",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "so",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "aai",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdc",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "trafficgenerator",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "eventmanager",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "guard",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actorServiceProvider",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.appc",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.appclcm",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.so",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.vfc",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "policy-yaml",
-            "version": "1.2.1-SNAPSHOT"
+            "version": "1.2.2"
         }, {
             "groupId": "com.att.research.xacml",
             "artifactId": "xacml-pdp",

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 29e9289..eabf00f 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>BRMSGateway</artifactId>
     <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>

diff --git a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
index 8f55bd8..a15eee3 100644 (file)
--- a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
@@ -118,7 +118,7 @@ public class BrmsPush {
     private static final Logger LOGGER = FlexLogger.getLogger(BrmsPush.class.getName());
     private static final String PROJECTSLOCATION = "RuleProjects";
     private static final String[] GOALS = {"clean", "deploy"};
-    private static final String DEFAULT_VERSION = "1.2.1-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.2.2";
     private static final String DEPENDENCY_FILE = "dependency.json";
     private static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml";
 

diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties
index 8eeb811..2330424 100644 (file)
--- a/BRMSGateway/src/test/resources/config.properties
+++ b/BRMSGateway/src/test/resources/config.properties
@@ -81,6 +81,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.2.1-SNAPSHOT
+brms.dependency.version=1.2.2
 
 ENVIRONMENT = DEVL

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index e1c345d..e887bf0 100644 (file)
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>LogParser</artifactId>
        <dependencies>

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index fc5ef93..2c694d2 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -28,7 +28,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <build>
                <plugins>

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 302410e..6ab3b49 100644 (file)
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>ONAP-PDP-REST</artifactId>
        <description>ONAP PDP REST</description>

diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 3f983f5..33af652 100644 (file)
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -28,7 +28,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <dependencies>
                <dependency>
@@ -83,7 +83,7 @@
                <dependency>
                        <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>policy-endpoints</artifactId>
-                       <version>${project.version}</version>
+                        <version>${project.version}</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -127,4 +127,4 @@
                        </plugin>
                </plugins>
        </build>
-</project>
\ No newline at end of file
+</project>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 6666852..2776c89 100644 (file)
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>ONAP-REST</artifactId>
        <description>ONAP REST</description>

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 766e947..ddc4252 100644 (file)
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>ONAP-SDK-APP</artifactId>
        <packaging>war</packaging>

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 79f0cb5..b2aa416 100644 (file)
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>ONAP-XACML</artifactId>
        <packaging>jar</packaging>

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 91ebf7a..f5ced68 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>POLICY-SDK-APP</artifactId>
        <packaging>war</packaging>

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/test-infra/npm-shrinkwrap.json b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/test-infra/npm-shrinkwrap.json
index 321fbea..0376beb 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/test-infra/npm-shrinkwrap.json
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/test-infra/npm-shrinkwrap.json
@@ -4485,4 +4485,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index ebfab47..09e647a 100644 (file)
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineAPI</artifactId>
        <dependencies>

diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index ec3f1a6..0c0d7fc 100644 (file)
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineClient</artifactId>
        <dependencies>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index ff896a7..cefb9b8 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineUtils</artifactId>
        <dependencies>

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index c9d0401..9ee6e4e 100755 (executable)
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>

diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties
index 63d39e9..fa79096 100644 (file)
--- a/packages/base/src/files/install/servers/brmsgw/config.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config.properties
@@ -84,6 +84,6 @@ test_via_jmx=${{test_via_jmx}}
 
 ping_interval=30000
 
-brms.dependency.version=1.2.1-SNAPSHOT
+brms.dependency.version=1.2.2
 
 CLIENT_FILE=client.properties

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 9d8f5e7..2ebd496 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                 <groupId>org.onap.policy.engine</groupId>
                 <artifactId>packages</artifactId>
-                <version>1.2.1-SNAPSHOT</version>
+                <version>1.2.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>docker</artifactId>

diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 7adecab..79274bc 100644 (file)
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>

diff --git a/packages/pom.xml b/packages/pom.xml
index 5b5fb78..3de0648 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>packages</artifactId>
        <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
index e0d6f94..0fde290 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
        </parent>
        <groupId>org.onap.policy.engine</groupId>
        <artifactId>PolicyEngineSuite</artifactId>
-       <version>1.2.1-SNAPSHOT</version>
+       <version>1.2.2-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>policy-engine</name>
        <description>The ONAP Policy Engine main pom</description>

diff --git a/version.properties b/version.properties
index ace1885..7e20a36 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -24,7 +24,7 @@
 
 major=1
 minor=2
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}