From 56a23de5d3f4ab454ef4a0c7c6e65456fbd234ce Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 5 Jun 2018 17:03:32 +0100 Subject: [PATCH] Update engine to SNAPSHOT-1.3.0 Snapshot updated for Casablanca. Change-Id: Ieb2c9a990c0f36f31c974038465e7d38aaa21e5d Issue-ID: POLICY-875 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 | 2 +- ONAP-REST/pom.xml | 2 +- ONAP-SDK-APP/pom.xml | 2 +- ONAP-XACML/pom.xml | 2 +- POLICY-SDK-APP/pom.xml | 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 | 4 +- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index e716c49fc..45ce3f02c 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,6 +77,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.2.3 +brms.dependency.version=1.3.0-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 000d3f61a..ce48042d7 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.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", - "version": "1.2.3" + "version": "1.3.0-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index e6e9bafae..7ae644930 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-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 caf49aa55..716b8ec53 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.3"; + private static final String DEFAULT_VERSION = "1.3.0-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 25eeb83a6..ff2e121ee 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.3 +brms.dependency.version=1.3.0-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 1dd7ee8d3..0f38c5721 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 15b512599..54b99b5ca 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 656da4b24..a301c1952 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index c329fba0c..d664cf4db 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index dbde32284..656d1ab17 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 16fc240ad..d246de926 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index f7b9bba62..bc3281f4d 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 0ce7b9d92..9f7d8e661 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 9fd60d14d..c27a4be62 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 78fa7a55d..f13923fd9 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 2baed14fe..c62c5e7ac 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT PolicyEngineUtils diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 2a60f14eb..8a809fe2b 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.3-SNAPSHOT + 1.3.0-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 c6c122e2f..9402a057b 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.3 +brms.dependency.version=1.3.0-SNAPSHOT CLIENT_FILE=client.properties diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index d001c5415..e8abdbcce 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 14d3a7863..4a102a0fb 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine packages - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index 6a869d02e..d196fbaf7 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 4fbaf627f..b31f72584 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom diff --git a/version.properties b/version.properties index b80ccebde..955d86e37 100644 --- a/version.properties +++ b/version.properties @@ -23,8 +23,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=2 -patch=3 +minor=3 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6