From: mmis <michael.morris@ericsson.com>
Date: Thu, 25 Oct 2018 14:00:22 +0000 (+0100)
Subject: Upgraded Tomcat version to 8.5.34
X-Git-Tag: 1.3.1^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=b9be194407acabc87d7e71b58430fbdd7ec4966e;hp=d7630c4c59a2d5947d942684bbe4ce8741a8fa7b

Upgraded Tomcat version to 8.5.34

Upgraded Tomcat to resolve security vulnerability
http://mail-archives.us.apache.org/mod_mbox/www-announce/201810.mbox/<4cf697b0-db03-9eab-f2aa-54c2026d0e88@apache.org>

Issue-ID: POLICY-1212
Change-Id: I05f09e3fb862ad485dee519a0014e51a0c8d9ac3
Signed-off-by: mmis <michael.morris@ericsson.com>
---

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 060c0c513..6d782a308 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -38,8 +38,8 @@
         <!-- Tests usually require some setup that maven cannot do, so skip. -->
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
         <!-- Version number gets stored only here -->
-        <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
-        <tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
+        <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.5.34/bin</tomcat.download.path>
+        <tomcat.download.name>apache-tomcat-8.5.34</tomcat.download.name>
     </properties>
     <profiles>
         <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 974f9eb34..fb95511d1 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -118,14 +118,14 @@
 								<artifactItem>
 									<groupId>org.apache.tomcat</groupId>
 									<artifactId>tomcat</artifactId>
-									<version>8.0.53</version>
+									<version>8.5.34</version>
 									<type>tar.gz</type>
 									<!--
 									Please note that if you change this version, you must
 									update the docker-install.sh script to ensure the right
 									file name is installed. 
 									 -->
-									<destFileName>apache-tomcat-8.0.53.tar.gz</destFileName>
+									<destFileName>apache-tomcat-8.5.34.tar.gz</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index 3700e5731..36cc8aa92 100644
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -628,7 +628,7 @@ DEBUG=n
 
 BASE_CONF=base.conf
 
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.53
+TOMCAT_PACKAGE_NAME=apache-tomcat-8.5.34
 
 INSTALL_DIR="$(pwd)"