# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1489484676 25200
# Node ID ec4c46e50642efe10a036a58f58b5818352beaae
# Parent  eaed6d702f0470afc3b22283a3092c0a16885462
25716748 Upgrade Apache Tomcat to version 8.5.11
25716728 problem in UTILITY/TOMCAT

diff -r eaed6d702f04 -r ec4c46e50642 components/tomcat-8/Makefile
--- a/components/tomcat-8/Makefile	Fri Apr 07 00:53:32 2017 -0700
+++ b/components/tomcat-8/Makefile	Tue Mar 14 02:44:36 2017 -0700
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	8.5.9
+COMPONENT_VERSION=	8.5.11
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC_NAME=	apache-tomcat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5
-COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
+    sha256:81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf
+COMPONENT_ARCHIVE_URL=	https://archive.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	4987
 
 # Tomcat subcomponents
@@ -41,7 +41,7 @@
     sha256:101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72
 COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			33003
+TPNO=			33670
 
 BUILD_STYLE= ant
 TEST_TARGET= $(SKIP_TEST)
diff -r eaed6d702f04 -r ec4c46e50642 components/tomcat-8/tomcat-admin.p5m
--- a/components/tomcat-8/tomcat-admin.p5m	Fri Apr 07 00:53:32 2017 -0700
+++ b/components/tomcat-8/tomcat-admin.p5m	Tue Mar 14 02:44:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/tomcat8/(.+)$ -> \
@@ -48,7 +48,7 @@
 file path=var/tomcat8/webapps/host-manager/WEB-INF/jsp/404.jsp
 file path=var/tomcat8/webapps/host-manager/WEB-INF/web.xml
 file path=var/tomcat8/webapps/host-manager/images/add.gif
-file path=var/tomcat8/webapps/host-manager/images/asf-logo.gif
+file path=var/tomcat8/webapps/host-manager/images/asf-logo.svg
 file path=var/tomcat8/webapps/host-manager/images/code.gif
 file path=var/tomcat8/webapps/host-manager/images/design.gif
 file path=var/tomcat8/webapps/host-manager/images/docs.gif
@@ -67,7 +67,7 @@
 file path=var/tomcat8/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 file path=var/tomcat8/webapps/manager/WEB-INF/web.xml
 file path=var/tomcat8/webapps/manager/images/add.gif
-file path=var/tomcat8/webapps/manager/images/asf-logo.gif
+file path=var/tomcat8/webapps/manager/images/asf-logo.svg
 file path=var/tomcat8/webapps/manager/images/code.gif
 file path=var/tomcat8/webapps/manager/images/design.gif
 file path=var/tomcat8/webapps/manager/images/docs.gif
diff -r eaed6d702f04 -r ec4c46e50642 components/tomcat-8/tomcat-examples.p5m
--- a/components/tomcat-8/tomcat-examples.p5m	Fri Apr 07 00:53:32 2017 -0700
+++ b/components/tomcat-8/tomcat-examples.p5m	Tue Mar 14 02:44:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=var/tomcat8/(.+)$ -> \
@@ -42,14 +42,12 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=var/tomcat8/webapps/ROOT.example/RELEASE-NOTES.txt
 file path=var/tomcat8/webapps/ROOT.example/WEB-INF/web.xml
-file path=var/tomcat8/webapps/ROOT.example/asf-logo-wide.gif
-file path=var/tomcat8/webapps/ROOT.example/asf-logo.png
+file path=var/tomcat8/webapps/ROOT.example/asf-logo-wide.svg
 file path=var/tomcat8/webapps/ROOT.example/bg-button.png
 file path=var/tomcat8/webapps/ROOT.example/bg-middle.png
 file path=var/tomcat8/webapps/ROOT.example/bg-nav-item.png
 file path=var/tomcat8/webapps/ROOT.example/bg-nav.png
 file path=var/tomcat8/webapps/ROOT.example/bg-upper.png
-file path=var/tomcat8/webapps/ROOT.example/build.xml
 file path=var/tomcat8/webapps/ROOT.example/favicon.ico
 file path=var/tomcat8/webapps/ROOT.example/index.jsp
 file path=var/tomcat8/webapps/ROOT.example/tomcat-power.gif
diff -r eaed6d702f04 -r ec4c46e50642 components/tomcat-8/tomcat.license
--- a/components/tomcat-8/tomcat.license	Fri Apr 07 00:53:32 2017 -0700
+++ b/components/tomcat-8/tomcat.license	Tue Mar 14 02:44:36 2017 -0700
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2016 The Apache Software Foundation
+Copyright 1999-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff -r eaed6d702f04 -r ec4c46e50642 components/tomcat-8/tomcat.p5m
--- a/components/tomcat-8/tomcat.p5m	Fri Apr 07 00:53:32 2017 -0700
+++ b/components/tomcat-8/tomcat.p5m	Tue Mar 14 02:44:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/tomcat8/(.+)$ -> \
@@ -155,8 +155,6 @@
 file path=usr/tomcat8/docs/funcspecs/mbean-names.html
 file path=usr/tomcat8/docs/html-manager-howto.html
 file path=usr/tomcat8/docs/images/add.gif
-file path=usr/tomcat8/docs/images/asf-feather.png
-file path=usr/tomcat8/docs/images/asf-logo.gif
 file path=usr/tomcat8/docs/images/code.gif
 file path=usr/tomcat8/docs/images/cors-flowchart.png
 file path=usr/tomcat8/docs/images/design.gif