summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-04-03 18:22:08 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-03 18:22:08 +0000
commit11eb39f53842dff62e81a38ab599ddbc97cf7b73 (patch)
treec1f76f072a8b9eb1c217ae55984d1bab05ec5146
parent5797b32ae6645aeef77162ce09a37b473c9d41d0 (diff)
parent4fb9d970c003b7f7c15a9baf3ee0552e2679352a (diff)
Merge "Update docker script for tomcat install"
-rwxr-xr-xpackages/base/pom.xml5
-rw-r--r--packages/docker/src/main/docker/docker-install.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index a08307daf..4f6607998 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -120,6 +120,11 @@
<artifactId>tomcat</artifactId>
<version>8.0.50</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.50.tar.gz</destFileName>
</artifactItem>
</artifactItems>
diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index e8b9aaf14..cd3e1f09b 100644
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -577,7 +577,7 @@ DEBUG=n
BASE_CONF=base.conf
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.23
+TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.50
INSTALL_DIR="$(pwd)"