# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1473145693 25200
# Node ID 71a106abd05d5ebe590bff7410834255e4575067
# Parent  e8aaad6b507593090962c32764b96a1df2d07cbb
24596166 Upgrade Apache Tomcat to version 8.5.5
24311971 problem in UTILITY/TOMCAT

diff -r e8aaad6b5075 -r 71a106abd05d components/tomcat-8/Makefile
--- a/components/tomcat-8/Makefile	Mon Sep 19 09:53:17 2016 -0700
+++ b/components/tomcat-8/Makefile	Tue Sep 06 00:08:13 2016 -0700
@@ -26,12 +26,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	8.5.3
+COMPONENT_VERSION=	8.5.5
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC_NAME=	apache-tomcat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d
+    sha256:28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 
 # Tomcat subcomponents
@@ -40,7 +40,7 @@
     sha256:101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72
 COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			29493
+TPNO=			31550
 
 BUILD_STYLE= ant
 TEST_TARGET= $(SKIP_TEST)
diff -r e8aaad6b5075 -r 71a106abd05d components/tomcat-8/patches/build.properties.patch
--- a/components/tomcat-8/patches/build.properties.patch	Mon Sep 19 09:53:17 2016 -0700
+++ b/components/tomcat-8/patches/build.properties.patch	Tue Sep 06 00:08:13 2016 -0700
@@ -16,10 +16,10 @@
 +# redirected to local file system.
 +userland-files.loc=file://${base.path}/../../
 +
- # ----- Commons Logging, version 1.1 or later -----
- # If this version is updated, check the versions required for the dependencies below
- # - avalon-framework
-@@ -150,7 +156,7 @@
+ # ----- Webservices - JAX RPC -----
+ jaxrpc-lib.version=1.1-rc4
+ jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
+@@ -114,7 +120,7 @@
  jdt.home=${base.path}/ecj-${jdt.version}
  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
  # The download will be moved to the archive area eventually. We are taking care of that in advance.
diff -r e8aaad6b5075 -r 71a106abd05d components/tomcat-8/patches/build.xml.patch
--- a/components/tomcat-8/patches/build.xml.patch	Mon Sep 19 09:53:17 2016 -0700
+++ b/components/tomcat-8/patches/build.xml.patch	Tue Sep 06 00:08:13 2016 -0700
@@ -6,7 +6,7 @@
 
 --- build.xml
 +++ build.xml
-@@ -1002,13 +1002,6 @@
+@@ -983,13 +983,6 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
  
@@ -20,7 +20,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -2788,27 +2781,6 @@
+@@ -2576,27 +2576,6 @@
    <target name="download-compile"
            description="Download (and build) components necessary to compile" >
  
diff -r e8aaad6b5075 -r 71a106abd05d components/tomcat-8/tomcat.p5m
--- a/components/tomcat-8/tomcat.p5m	Mon Sep 19 09:53:17 2016 -0700
+++ b/components/tomcat-8/tomcat.p5m	Tue Sep 06 00:08:13 2016 -0700
@@ -185,7 +185,7 @@
 file path=usr/tomcat8/docs/logging.html
 file path=usr/tomcat8/docs/manager-howto.html
 file path=usr/tomcat8/docs/maven-jars.html
-file path=usr/tomcat8/docs/mbeans-descriptor-howto.html
+file path=usr/tomcat8/docs/mbeans-descriptors-howto.html
 file path=usr/tomcat8/docs/monitoring.html
 file path=usr/tomcat8/docs/proxy-howto.html
 file path=usr/tomcat8/docs/realm-howto.html