From 60948d65d70056c059dd1f3063a9ca0a00724f12 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Thu, 30 Apr 2020 16:05:19 -0400 Subject: [PATCH] Bump engine patch 1.6.4-SNAPSHOT And point to latest parent, common and models. Issue-ID: POLICY-2510 Change-Id: Ib0cab4b57fb6efb8388d89bedcf2d34164edc0e7 Signed-off-by: Pamela Dragosh --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 54 +++++++++++----------- 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 +- TestSuite/Performance/pom.xml | 2 +- TestSuite/Stability/pom.xml | 2 +- TestSuite/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/install/src/files/brmsgw.conf | 4 +- packages/pom.xml | 2 +- pom.xml | 8 ++-- version.properties | 2 +- 27 files changed, 57 insertions(+), 57 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 585e0027a..d8f02ba3d 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,7 +77,7 @@ ping_interval=30000 # # # -brms.dependency.version=1.6.2-SNAPSHOT +brms.dependency.version=1.6.3-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 1b450e3c1..bd119bdc2 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,112 +3,112 @@ "default": [{ "groupId": "org.onap.policy.drools-applications.controlloop.templates", "artifactId": "template.demo", - "version": "1.6.2-SNAPSHOT" + "version": "1.6.3-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "rest", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appclcm", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "vfc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.6.2-SNAPSHOT" + "version": "1.6.3-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.6.2-SNAPSHOT" + "version": "1.6.3-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actorServiceProvider", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appclcm", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.so", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnr", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.vfc", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions", "artifactId": "model-yaml", - "version": "2.2.5-SNAPSHOT" + "version": "2.2.6-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index c34def84c..dab57c5fa 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-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 4e01b0a84..e321811a3 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 @@ -117,7 +117,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.6.2-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.6.3-SNAPSHOT"; private static final String DEPENDENCY_FILE = "dependency.json"; private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key"; public static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml"; diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties index c7522cfe4..ce937dff0 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.6.2-SNAPSHOT +brms.dependency.version=1.6.3-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 534cdbee6..6430982c1 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 3b518ca2d..3a7d1b9e9 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT 4.3.10.Final diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 490839ad7..15b6702b7 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 4a7e63ab5..18f77c570 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 405148952..bfd298ce8 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index f98f82824..0d753fb13 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 99873ca61..490789266 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index d0be7941a..b1b1f03e8 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 8a93e98af..830acc786 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 8886a7941..89c5c8974 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 3df31c8d5..ba16c7236 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index d1fef7343..151ef5202 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index ce729211a..aee373caa 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 467f4643a..22efd4dbe 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 5715ceb32..47ae6df3f 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.6.3-SNAPSHOT + 1.6.4-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 2666b8ca4..d54f56d77 100644 --- a/packages/base/src/files/install/servers/brmsgw/config.properties +++ b/packages/base/src/files/install/servers/brmsgw/config.properties @@ -84,7 +84,7 @@ test_via_jmx=${{test_via_jmx}} ping_interval=30000 -brms.dependency.version=1.6.2-SNAPSHOT +brms.dependency.version=1.6.3-SNAPSHOT CLIENT_FILE=client.properties diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index a62e25d71..38f8ab4a1 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine packages - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 63ef0bdf1..50ffa1c25 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT install diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index 7dd1153ba..09cf69d67 100644 --- a/packages/install/src/files/brmsgw.conf +++ b/packages/install/src/files/brmsgw.conf @@ -59,5 +59,5 @@ CLIENT_ID=PDPServer CLIENT_KEY=test ENVIRONMENT=DEVL -BRMS_DEPENDENCY_VERSION=1.6.2-SNAPSHOT -BRMS_MODELS_DEPENDENCY_VERSION=2.2.5-SNAPSHOT +BRMS_DEPENDENCY_VERSION=1.6.3-SNAPSHOT +BRMS_MODELS_DEPENDENCY_VERSION=2.2.6-SNAPSHOT diff --git a/packages/pom.xml b/packages/pom.xml index 2bec2a50a..17f596f7a 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 91ae711de..876d74f05 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ org.onap.policy.parent integration - 3.1.2 + 3.1.3-SNAPSHOT org.onap.policy.engine PolicyEngineSuite - 1.6.3-SNAPSHOT + 1.6.4-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -54,8 +54,8 @@ 1.3.3 1.18 6.8.2 - 1.6.4 - 2.2.4 + 1.6.5-SNAPSHOT + 2.2.6-SNAPSHOT PolicyEngineUtils diff --git a/version.properties b/version.properties index d6bddbc2d..cf52995b4 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=6 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} -- 2.16.6