From e1b6c5ee7c5a5ecf5c985c5d124a315f99956199 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 26 Feb 2019 07:45:26 -0500 Subject: Upgrade elasticsearch 6.4.3 Unable to cherry-pick, so making a new review. And need to upgrade the version. This upgrade fixes a few security issues as described in the JIRA. Issue-ID: POLICY-1538 Change-Id: I467acbb1dce1a922b13a521e9dd40477c012b409 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 +- 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 +- packages/docker/pom.xml | 2 +- packages/install/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 4 +- version.properties | 2 +- 25 files changed, 54 insertions(+), 54 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index ad98bf396..82269d467 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,6 +77,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.3.5-SNAPSHOT +brms.dependency.version=1.3.6-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 0f1f72072..37ff14320 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.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnr", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnr", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdnc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.sdnc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.sdnr", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", - "version": "1.3.5-SNAPSHOT" + "version": "1.3.6-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 086c2494e..5abc6c01d 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-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 4a0f2f0eb..6dca12795 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.5-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.3.6-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 b47a698c7..67368cab8 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.5-SNAPSHOT +brms.dependency.version=1.3.6-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 40d5f509e..a5d8f107f 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index d7168b308..130e5c780 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index d254d62a9..c28df738d 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 34ba4161a..6a141f6b5 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 526756ad7..305fe6fad 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index f7969f750..01c6c0386 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 1b21a46bb..6871fdac1 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 760db3a91..70749eccf 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index fc70c7441..ebc4eedc9 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 7df3c7cbd..bb496390e 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index e92e86427..0c2de0f27 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index 7171215d4..0e32ba87b 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index 45fa7c48f..c8242922a 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 53b02ab0f..394204189 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 948ca0607..85ff7fb1f 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT base diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index f0ca64fa9..2eac9cc6a 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index bc395ce75..267a8c0ae 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index d2640d3b3..9bfd89038 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 8faf4c9fa..ecf04115f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.5-SNAPSHOT + 1.3.6-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -63,7 +63,7 @@ 2.9.4 1.3.3 1.18 - 6.3.0 + 6.4.3 1.3.4 1.3.5 diff --git a/version.properties b/version.properties index 2cfb0c690..5f7f13cff 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=3 -patch=5 +patch=6 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg