From 4929b5edc2c3b204fa63429c879a6cf50ad76b8c Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 31 Oct 2018 17:28:58 +0000 Subject: [PATCH] Set new master version for Dublin Issue-ID: POLICY-1232 Change-Id: I81e2b700debd4acca52f8ed9bbf8b54d75ceca83 Signed-off-by: liamfallon --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 58 +++++++++++----------- BRMSGateway/pom.xml | 5 +- .../java/org/onap/policy/brms/api/BrmsPush.java | 2 +- BRMSGateway/src/test/resources/config.properties | 2 +- LogParser/pom.xml | 6 +-- ONAP-PAP-REST/pom.xml | 6 +-- ONAP-PDP-REST/pom.xml | 6 +-- ONAP-PDP/pom.xml | 6 +-- ONAP-REST/pom.xml | 6 +-- ONAP-SDK-APP/pom.xml | 6 +-- ONAP-XACML/pom.xml | 6 +-- POLICY-SDK-APP/pom.xml | 6 +-- PolicyEngineAPI/pom.xml | 6 +-- PolicyEngineClient/pom.xml | 6 +-- PolicyEngineUtils/pom.xml | 6 +-- TestSuite/Performance/pom.xml | 6 +-- TestSuite/Stability/pom.xml | 6 +-- TestSuite/pom.xml | 6 +-- packages/base/pom.xml | 7 ++- packages/docker/pom.xml | 5 +- packages/install/pom.xml | 5 +- packages/pom.xml | 5 +- pom.xml | 12 ++--- version.properties | 4 +- 25 files changed, 78 insertions(+), 113 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index c795aa4a3..d99e0e658 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,6 +77,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.3.1-SNAPSHOT +brms.dependency.version=1.4.0-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 32f6bc927..6d8c4ff78 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.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnr", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnr", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.sdnc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.sdnr", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", - "version": "1.3.1-SNAPSHOT" + "version": "1.4.0-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 62c6e55e4..1922e90b3 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -18,13 +18,12 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.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 a7c21a890..033c78df7 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.1-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.4.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 a90d4513c..a46357276 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.1-SNAPSHOT +brms.dependency.version=1.4.0-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index a7c3d7c4a..f088f217b 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -19,14 +19,12 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 7cf30b979..21e7db989 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -19,9 +19,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 ONAP-PAP-REST ONAP-PAP-REST @@ -29,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 2b69249fa..bffc06b38 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -18,14 +18,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 046132289..32d26e2b5 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -19,9 +19,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 ONAP-PDP ONAP-PDP @@ -29,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 271c75311..5d899fcbe 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -20,14 +20,12 @@ --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 6d782a308..65da53b77 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -17,14 +17,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 03bc9992f..4c1da4238 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -19,14 +19,12 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 3b4558225..758327296 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -17,14 +17,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 48468cb95..da13a9a91 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -19,14 +19,12 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 4c3e32e15..feb9e51ea 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -19,14 +19,12 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 66158153d..27b91d419 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -17,14 +17,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index cbcca5284..7a5b6a16e 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -18,14 +18,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine TestSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index 000a12b9c..d52038491 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -18,14 +18,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine TestSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 85ff36710..8c96319d3 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -18,14 +18,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index fb95511d1..f5b936b44 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine packages - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT base @@ -221,7 +220,7 @@ /bin/bash -c - mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info + mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 6d88647ef..04a65adcb 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine packages - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 4c66e808e..72a978de9 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine packages - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index faca69272..a1dc9854f 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -18,13 +18,12 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index dec4433d3..162ea8870 100644 --- a/pom.xml +++ b/pom.xml @@ -17,19 +17,17 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.parent integration - 2.0.0 + 2.1.0-SNAPSHOT org.onap.policy.engine PolicyEngineSuite - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -66,8 +64,8 @@ 1.3.3 1.18 6.3.0 - 1.3.1 - 1.3.1 + 1.4.0-SNAPSHOT + 1.4.0-SNAPSHOT PolicyEngineUtils diff --git a/version.properties b/version.properties index 19266e34c..c0fb9b16f 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=3 -patch=1 +minor=4 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6