22363179 Upgrade Apache Tomcat to version 8.0.30 s11u3-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 29 Dec 2015 08:23:34 -0800
branchs11u3-sru
changeset 5318 efa7f7393e63
parent 5317 fa561e436e88
child 5319 cfb66c73d0f2
22363179 Upgrade Apache Tomcat to version 8.0.30
components/tomcat-8/Makefile
components/tomcat-8/patches/build.properties.patch
components/tomcat-8/patches/build.xml.patch
components/tomcat-8/tomcat.license
components/tomcat-8/tomcat.p5m
--- a/components/tomcat-8/Makefile	Sat Jan 23 12:02:26 2016 -0800
+++ b/components/tomcat-8/Makefile	Tue Dec 29 08:23:34 2015 -0800
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	8.0.21
+COMPONENT_VERSION=	8.0.30
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC_NAME=	apache-tomcat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9fe0d4f0f86593a78eec952b257c7282765604926c30fe13c9dbe6f9f35674d8
+    sha256:0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/tomcat
 
@@ -42,7 +42,7 @@
     sha256:ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858
 COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			22471
+TPNO=			25995
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ant.mk
--- a/components/tomcat-8/patches/build.properties.patch	Sat Jan 23 12:02:26 2016 -0800
+++ b/components/tomcat-8/patches/build.properties.patch	Tue Dec 29 08:23:34 2015 -0800
@@ -6,7 +6,7 @@
 
 --- build.properties.default
 +++ build.properties.default
[email protected]@ -87,6 +87,12 @@
[email protected]@ -100,6 +100,12 @@
  # Mirror, was used when there were problems with the main SF downloads site
  # base-sf.loc=http://sunet.dl.sourceforge.net
  
@@ -19,7 +19,7 @@
  # ----- Commons Logging, version 1.1 or later -----
  # If this version is updated, check the versions required for the dependencies below
  # - avalon-framework
[email protected]@ -142,7 +148,7 @@
[email protected]@ -155,7 +161,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.
@@ -27,4 +27,4 @@
 +jdt.loc.1=file://${base.path}/ECJ/ecj.jar
  jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
  
- # ---- NPN support
+ # ----- Tomcat native library -----
--- a/components/tomcat-8/patches/build.xml.patch	Sat Jan 23 12:02:26 2016 -0800
+++ b/components/tomcat-8/patches/build.xml.patch	Tue Dec 29 08:23:34 2015 -0800
@@ -6,7 +6,7 @@
 
 --- build.xml
 +++ build.xml
[email protected]@ -999,13 +999,6 @@
[email protected]@ -988,13 +988,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">
[email protected]@ -2744,27 +2737,6 @@
[email protected]@ -2796,27 +2789,6 @@
    <target name="download-compile"
            description="Download (and build) components necessary to compile" >
  
@@ -48,19 +48,3 @@
      <!-- Download JDT (Eclipse compiler) -->
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${jdt.loc.1}"/>
[email protected]@ -2775,15 +2747,6 @@
- 
-   </target>
- 
--  <target name="download-npn"
--          description="Download optional NPN" >
--    <antcall target="downloadfile">
--     <param name="sourcefile" value="${npn.loc}"/>
--     <param name="destfile" value="${npn.jar}"/>
--     <param name="destdir" value="${npn.home}"/>
--    </antcall>
--  </target>
--
-   <target name="download-test-compile"
-           description="Download additional components for the tests" >
- 
--- a/components/tomcat-8/tomcat.license	Sat Jan 23 12:02:26 2016 -0800
+++ b/components/tomcat-8/tomcat.license	Tue Dec 29 08:23:34 2015 -0800
@@ -212,6 +212,7 @@
 
 
 1.  The follow files are available in source code form under the Eclipse Public License at:  http://archive.eclipse.org/eclipse/downloads/ .  (The EPL license is reproduced below).
+    * ecj-4.4.2.jar
 
 2.  All past Contributors to the Eclipse JDT Java compiler disclaim all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose.  In addition, such Contributors are not liable for any damages, including direct, indirect, special, incidental and consequential damages, such as lost profits.  
 
--- a/components/tomcat-8/tomcat.p5m	Sat Jan 23 12:02:26 2016 -0800
+++ b/components/tomcat-8/tomcat.p5m	Tue Dec 29 08:23:34 2015 -0800
@@ -90,8 +90,8 @@
 file path=usr/tomcat8/docs/architecture/index.html
 file path=usr/tomcat8/docs/architecture/overview.html
 file path=usr/tomcat8/docs/architecture/requestProcess.html
-file path=usr/tomcat8/docs/architecture/requestProcess/requestProcess.pdf
-file path=usr/tomcat8/docs/architecture/requestProcess/roseModel.mdl
+file path=usr/tomcat8/docs/architecture/requestProcess/authentication-process.png
+file path=usr/tomcat8/docs/architecture/requestProcess/request-process.png
 file path=usr/tomcat8/docs/architecture/startup.html
 file path=usr/tomcat8/docs/architecture/startup/serverStartup.pdf
 file path=usr/tomcat8/docs/architecture/startup/serverStartup.txt
@@ -228,7 +228,6 @@
 file path=usr/tomcat8/lib/tomcat-i18n-ja.jar
 file path=usr/tomcat8/lib/tomcat-jdbc.jar
 file path=usr/tomcat8/lib/tomcat-jni.jar
-file path=usr/tomcat8/lib/tomcat-spdy.jar
 file path=usr/tomcat8/lib/tomcat-util-scan.jar
 file path=usr/tomcat8/lib/tomcat-util.jar
 file path=usr/tomcat8/lib/tomcat-websocket.jar