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 <pdragosh@research.att.com>

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index ad98bf3..82269d4 100644 (file)
--- 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 0f1f720..37ff143 100644 (file)
--- 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 086c249..5abc6c0 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>BRMSGateway</artifactId>
     <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>

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 4a0f2f0..6dca127 100644 (file)
--- 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 b47a698..67368ca 100644 (file)
--- 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 40d5f50..a5d8f10 100644 (file)
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>LogParser</artifactId>
     <dependencies>

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index d7168b3..130e5c7 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index d254d62..c28df73 100644 (file)
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-PDP-REST</artifactId>
     <description>ONAP PDP REST</description>

diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 34ba416..6a141f6 100644 (file)
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 526756a..305fe6f 100644 (file)
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-REST</artifactId>
     <description>ONAP REST</description>

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index f7969f7..01c6c03 100644 (file)
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-SDK-APP</artifactId>
     <packaging>war</packaging>

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 1b21a46..6871fda 100644 (file)
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-XACML</artifactId>
     <packaging>jar</packaging>

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 760db3a..70749ec 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>POLICY-SDK-APP</artifactId>
     <packaging>war</packaging>

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index fc70c74..ebc4eed 100644 (file)
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineAPI</artifactId>
     <dependencies>

diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index 7df3c7c..bb49639 100644 (file)
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineClient</artifactId>
     <dependencies>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index e92e864..0c2de0f 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>

diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml
index 7171215..0e32ba8 100644 (file)
--- a/TestSuite/Performance/pom.xml
+++ b/TestSuite/Performance/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.3.6-SNAPSHOT</version>
   </parent>
   <artifactId>Performance</artifactId>
   <properties>

diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml
index 45fa7c4..c824292 100644 (file)
--- a/TestSuite/Stability/pom.xml
+++ b/TestSuite/Stability/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.3.6-SNAPSHOT</version>
   </parent>
   <artifactId>Stability</artifactId>
   <properties>

diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml
index 53b02ab..3942041 100644 (file)
--- a/TestSuite/pom.xml
+++ b/TestSuite/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>1.3.6-SNAPSHOT</version>
     </parent>
     <artifactId>TestSuite</artifactId>
     <packaging>pom</packaging>

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 948ca06..85ff7fb 100755 (executable)
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.3.5-SNAPSHOT</version>
+               <version>1.3.6-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index f0ca64f..2eac9cc 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                 <groupId>org.onap.policy.engine</groupId>
                 <artifactId>packages</artifactId>
-                <version>1.3.5-SNAPSHOT</version>
+                <version>1.3.6-SNAPSHOT</version>
        </parent>
 
        <artifactId>docker</artifactId>

diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index bc395ce..267a8c0 100644 (file)
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.3.5-SNAPSHOT</version>
+               <version>1.3.6-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>

diff --git a/packages/pom.xml b/packages/pom.xml
index d2640d3..9bfd890 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.5-SNAPSHOT</version>
+               <version>1.3.6-SNAPSHOT</version>
        </parent>
        <artifactId>packages</artifactId>
        <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
index 8faf4c9..ecf0411 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.3.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -63,7 +63,7 @@
         <jackson.version>2.9.4</jackson.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
-        <elasticsearch.version>6.3.0</elasticsearch.version>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
         <version.policy.common>1.3.4</version.policy.common>
         <version.policy.drools-application>1.3.5</version.policy.drools-application>
     </properties>

diff --git a/version.properties b/version.properties
index 2cfb0c6..5f7f13c 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -24,7 +24,7 @@
 
 major=1
 minor=3
-patch=5
+patch=6
 
 base_version=${major}.${minor}.${patch}