From 1da88553b5bc956d0d4bf7d9f460e81e25a5fe88 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 16 May 2018 13:59:46 +0100 Subject: [PATCH] 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 Signed-off-by: Pamela Dragosh Signed-off-by: liamfallon --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 46 +++++++++++----------- BRMSGateway/pom.xml | 2 +- .../java/org/onap/policy/brms/api/BrmsPush.java | 2 +- BRMSGateway/src/test/resources/config.properties | 2 +- LogParser/pom.xml | 2 +- ONAP-PAP-REST/pom.xml | 2 +- ONAP-PDP-REST/pom.xml | 2 +- ONAP-PDP/pom.xml | 6 +-- ONAP-REST/pom.xml | 2 +- ONAP-SDK-APP/pom.xml | 2 +- ONAP-XACML/pom.xml | 2 +- POLICY-SDK-APP/pom.xml | 2 +- .../CSS/bootstrap/test-infra/npm-shrinkwrap.json | 2 +- PolicyEngineAPI/pom.xml | 2 +- PolicyEngineClient/pom.xml | 2 +- PolicyEngineUtils/pom.xml | 2 +- packages/base/pom.xml | 2 +- .../files/install/servers/brmsgw/config.properties | 2 +- packages/docker/pom.xml | 2 +- packages/install/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 7b562bf46..081d308ca 100644 --- 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 906d34579..aa200f1ae 100644 --- 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 29e9289bf..eabf00f34 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT BRMSGateway This application will take in BRMS rules and acts as interface between PR and PDP XACML 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 8f55bd85c..a15eee34d 100644 --- 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 8eeb8116e..2330424b4 100644 --- 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 e1c345de8..e887bf03e 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index fc5ef9362..2c694d293 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 302410e3e..6ab3b4970 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 3f983f50f..33af65235 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT @@ -83,7 +83,7 @@ org.onap.policy.drools-pdp policy-endpoints - ${project.version} + ${project.version} test @@ -127,4 +127,4 @@ - \ No newline at end of file + diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 66668526c..2776c89b5 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 766e9475e..ddc425273 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 79f0cb520..b2aa41611 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 91ebf7a9c..f5ced6814 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT POLICY-SDK-APP war 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 321fbea9c..0376bebdd 100644 --- 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 ebfab472e..09e647a04 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index ec3f1a632..0c0d7fc54 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index ff896a7bd..cefb9b8bf 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT PolicyEngineUtils diff --git a/packages/base/pom.xml b/packages/base/pom.xml index c9d04016f..9ee6e4e0a 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT base diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties index 63d39e9dc..fa7909608 100644 --- 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 9d8f5e795..2ebd49699 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 7adecab94..79274bc63 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index 5b5fb789a..3de0648be 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index e0d6f949a..0fde2900d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom diff --git a/version.properties b/version.properties index ace1885ef..7e20a36bf 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=2 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} -- 2.16.6