From: liamfallon Date: Mon, 21 May 2018 15:49:26 +0000 (+0100) Subject: Update Policy Engine to 1.2.3-SNAPSHOT X-Git-Tag: v1.2.3~6^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=a7f30f3bdd7b3118e423243e6328c4c7ffe32244 Update Policy Engine to 1.2.3-SNAPSHOT These reviews must be merged in order because of layering. This review should be merged FOURTH. Change-Id: Ifca8e33b79085a4032164b44dae3401f8179f5f6 Issue-ID: POLICY-844 Signed-off-by: liamfallon --- diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 081d308ca..e716c49fc 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,6 +77,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.2.2 +brms.dependency.version=1.2.3 ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index aa200f1ae..000d3f61a 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.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.2.2" + "version": "1.2.3" }], "amsterdam": [{ "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", - "version": "1.2.2" + "version": "1.2.3" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index eabf00f34..e6e9bafae 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.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 a15eee34d..caf49aa55 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.2"; + private static final String DEFAULT_VERSION = "1.2.3"; 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 2330424b4..25eeb83a6 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.2 +brms.dependency.version=1.2.3 ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index e887bf03e..1dd7ee8d3 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 2c694d293..15b512599 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 6ab3b4970..656da4b24 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 33af65235..c329fba0c 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 2776c89b5..dbde32284 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index ddc425273..16fc240ad 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index b2aa41611..f7b9bba62 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index f5ced6814..0ce7b9d92 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 09e647a04..9fd60d14d 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 0c0d7fc54..78fa7a55d 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index cefb9b8bf..2baed14fe 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT PolicyEngineUtils diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 9ee6e4e0a..2a60f14eb 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.2-SNAPSHOT + 1.2.3-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 fa7909608..c6c122e2f 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.2 +brms.dependency.version=1.2.3 CLIENT_FILE=client.properties diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 2ebd49699..d001c5415 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 79274bc63..14d3a7863 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index 3de0648be..6a869d02e 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 0fde2900d..4fbaf627f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom diff --git a/version.properties b/version.properties index 7e20a36bf..b80ccebde 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=2 -patch=2 +patch=3 base_version=${major}.${minor}.${patch}