From cf54241ec76e67246961eb2d25c55b1e14c43877 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 6 Nov 2018 13:37:35 -0500 Subject: Update dmaap 1.1.9 changes Upgrading policy/parent to v1.1.9 requires these code changes to occur. Need to change to policy/parent 2.0.1 for the right dmaap to be included. Upgrade policy common and drools-applications to 1.3.3 released artifacts. Also just included the change from gerrit review https://gerrit.onap.org/r/#/c/72026/ instead of cherry picking it. Updating release to 1.3.3-SNAPSHOT Issue-ID: POLICY-1229 Change-Id: I16f4bbd9ba2d46cdc3b94feba1f2e7f20d837dad Signed-off-by: Pamela Dragosh (cherry picked from commit fe8b9e72cafa4acf31db4239593a74a5ccf89a4a) Signed-off-by: Pamela Dragosh --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 58 +++++++++++----------- BRMSGateway/pom.xml | 2 +- .../java/org/onap/policy/brms/api/BrmsPush.java | 2 +- BRMSGateway/src/test/resources/config.properties | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) (limited to 'BRMSGateway') diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 4e92ee8b2..31aa67aab 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,6 +77,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.3.2-SNAPSHOT +brms.dependency.version=1.3.3-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index b8e3e7cd3..3c25ac2d1 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,120 +3,120 @@ "default": [{ "groupId": "org.onap.policy.drools-applications.controlloop.templates", "artifactId": "template.demo", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnr", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnr", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.sdnc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.sdnr", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", - "version": "1.3.2-SNAPSHOT" + "version": "1.3.3-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 343df9eb3..f9da8cd55 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-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 e7dab547a..bd8fb111a 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.3.2-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.3.3-SNAPSHOT"; 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 fdee7d9e3..92ae2ad18 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.3.2-SNAPSHOT +brms.dependency.version=1.3.3-SNAPSHOT ENVIRONMENT = DEVL -- cgit 1.2.3-korg