version upgrade of apache-tomcat

CHANGELOG.md

+Upcoming version:
+-----------------
+  - version upgrade of apache-tomcat (Nikolaus Krismer)
+
 Version v0.6.1:
 ---------------
   - fixed indent (Nikolaus Krismer)

bootstrap/prepareEnvironment.sh

@@ -147,7 +147,7 @@ TEMPLATE_PSIPROBE_VERSION="2.4.0"
 TEMPLATE_PSIPROBE_FILE="probe-$TEMPLATE_PSIPROBE_VERSION.zip"
 TEMPLATE_PSIPROBE_DOWNLOAD_URL="https://github.com/psi-probe/psi-probe/releases/download/$TEMPLATE_PSIPROBE_VERSION/$TEMPLATE_PSIPROBE_FILE"
 TEMPLATE_DIR_ISOCHRONE="/vagrant"
-TOMCAT_VERSION="8.0.30"
+TOMCAT_VERSION="8.0.36"
 TOMCAT_FILE="apache-tomcat-$TOMCAT_VERSION.tar.gz"
 TOMCAT_DOWNLOAD_URL="http://www.eu.apache.org/dist/tomcat/tomcat-8/v$TOMCAT_VERSION/bin/$TOMCAT_FILE"
 TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m"
@@ -413,7 +413,7 @@ if $INSTALL_POSTGRES; then
 	yum -y install $POSTGRESQL_PKG_NAME $POSTGRESQL_PKG_NAME-contrib $POSTGRESQL_PKG_NAME-server >> $WORKING_DIR/install_postgresql.log 2>&1
 	if $INSTALL_GDAL; then
 		yum -y install $POSTGRESQL_PKG_NAME-devel >> $WORKING_DIR/install_postgresql.log 2>&1
-	fi	
+	fi
 
 	fn_echo "  - exporting postgresql options"
 	echo "export PostgreSQL_ROOT=\"/usr/pgsql-$POSTGRESQL_VERSION\"" >> /etc/profile.d/postgresql.sh
@@ -452,7 +452,7 @@ if $INSTALL_JAVA; then
 	sleep 5
 
 	fn_echo "Installing java (oracle jdk-$JAVA_VERSION)"
-	fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE "${JAVA_DOWNLOAD_URL}/${JAVA_FILE}" "${OTN_LICENSE_PARAMS}" 
+	fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE "${JAVA_DOWNLOAD_URL}/${JAVA_FILE}" "${OTN_LICENSE_PARAMS}"
 	yum -y localinstall $DOWNLOAD_DIR/$JAVA_FILE >> $WORKING_DIR/install_java.log 2>&1
 	ln -sf /usr/java/latest $DEPLOY_DIR/jdk >> $WORKING_DIR/setup_java.log 2>&1
 	ln -sf /usr/java/latest/jre $DEPLOY_DIR/jre >> $WORKING_DIR/setup_java.log 2>&1
@@ -607,7 +607,7 @@ if $INSTALL_NEO4J; then
 
 	fn_echo "  - enabling neo4j network access (without user)"
 	fn_echo "org.neo4j.server.webserver.address=0.0.0.0" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
-	sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4j-server.properties 
+	sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
 
 	fn_echo "  - creating systemd service"
 	cp "$SHARED_CONF_DIR/neo4j.service" "/etc/systemd/system/neo4j.service" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
@@ -675,7 +675,7 @@ if $INSTALL_SPATIALITE; then
 
 	fn_echo "Installing spatialite $SPATIALITE_VERSION (from source)"
 	fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILE $SPATIALITE_URL
-	tar -xvf $DOWNLOAD_DIR/$SPATIALITE_FILE -C $DEPLOY_DIR >> $WORKING_DIR/install_spatialite.log 2>&1 
+	tar -xvf $DOWNLOAD_DIR/$SPATIALITE_FILE -C $DEPLOY_DIR >> $WORKING_DIR/install_spatialite.log 2>&1
 	ln -sf $DEPLOY_DIR/libspatialite* $DEPLOY_DIR/libspatialite
 
 	cd $DEPLOY_DIR/libspatialite
@@ -792,7 +792,7 @@ fi
 
 if $INSTALL_SPATIALITE_ADMIN; then
 	# TODO: Check this (does not seem to work)
-	# TODO: What to do if there are multiple target_srid defined 
+	# TODO: What to do if there are multiple target_srid defined
 	fn_echo "Configuring phpLiteAdmin"
 	cp $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.sample.php $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/password = 'admin'/password = '${TOMCAT_PASSWORD}'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php