From 1da88553b5bc956d0d4bf7d9f460e81e25a5fe88 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 16 May 2018 13:59:46 +0100 Subject: 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 +- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'BRMSGateway') 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 -- cgit 1.2.3-korg