From a32c3eaf87a6023cd23fae88293b3491b153140b Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Tue, 21 Feb 2017 11:18:51 +0300 Subject: [PATCH] tomcat-8: update to 8.0.41 --- components/web/tomcat-8/Makefile | 5 ++--- components/web/tomcat-8/manifests/sample-manifest.p5m | 11 ++++------- components/web/tomcat-8/tomcat-admin.p5m | 4 ++-- components/web/tomcat-8/tomcat-examples.p5m | 4 +--- components/web/tomcat-8/tomcat.p5m | 3 +-- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/components/web/tomcat-8/Makefile b/components/web/tomcat-8/Makefile index 84119a8e3..0847c0c96 100644 --- a/components/web/tomcat-8/Makefile +++ b/components/web/tomcat-8/Makefile @@ -26,14 +26,13 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= tomcat -COMPONENT_VERSION= 8.0.39 -COMPONENT_REVISION= 1 +COMPONENT_VERSION= 8.0.41 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:566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 + sha256:2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/tomcat diff --git a/components/web/tomcat-8/manifests/sample-manifest.p5m b/components/web/tomcat-8/manifests/sample-manifest.p5m index 453bf1755..0f6c7686b 100644 --- a/components/web/tomcat-8/manifests/sample-manifest.p5m +++ b/components/web/tomcat-8/manifests/sample-manifest.p5m @@ -78,14 +78,12 @@ file path=lib/tomcat-websocket.jar file path=lib/websocket-api.jar file path=webapps/ROOT/RELEASE-NOTES.txt file path=webapps/ROOT/WEB-INF/web.xml -file path=webapps/ROOT/asf-logo-wide.gif -file path=webapps/ROOT/asf-logo.png +file path=webapps/ROOT/asf-logo-wide.svg file path=webapps/ROOT/bg-button.png file path=webapps/ROOT/bg-middle.png file path=webapps/ROOT/bg-nav-item.png file path=webapps/ROOT/bg-nav.png file path=webapps/ROOT/bg-upper.png -file path=webapps/ROOT/build.xml file path=webapps/ROOT/favicon.ico file path=webapps/ROOT/index.jsp file path=webapps/ROOT/tomcat-power.gif @@ -183,8 +181,7 @@ file path=webapps/docs/funcspecs/index.html file path=webapps/docs/funcspecs/mbean-names.html file path=webapps/docs/html-manager-howto.html file path=webapps/docs/images/add.gif -file path=webapps/docs/images/asf-feather.png -file path=webapps/docs/images/asf-logo.gif +file path=webapps/docs/images/asf-logo.svg file path=webapps/docs/images/code.gif file path=webapps/docs/images/cors-flowchart.png file path=webapps/docs/images/design.gif @@ -627,7 +624,7 @@ file path=webapps/host-manager/WEB-INF/jsp/403.jsp file path=webapps/host-manager/WEB-INF/jsp/404.jsp file path=webapps/host-manager/WEB-INF/web.xml file path=webapps/host-manager/images/add.gif -file path=webapps/host-manager/images/asf-logo.gif +file path=webapps/host-manager/images/asf-logo.svg file path=webapps/host-manager/images/code.gif file path=webapps/host-manager/images/design.gif file path=webapps/host-manager/images/docs.gif @@ -646,7 +643,7 @@ file path=webapps/manager/WEB-INF/jsp/sessionDetail.jsp file path=webapps/manager/WEB-INF/jsp/sessionsList.jsp file path=webapps/manager/WEB-INF/web.xml file path=webapps/manager/images/add.gif -file path=webapps/manager/images/asf-logo.gif +file path=webapps/manager/images/asf-logo.svg file path=webapps/manager/images/code.gif file path=webapps/manager/images/design.gif file path=webapps/manager/images/docs.gif diff --git a/components/web/tomcat-8/tomcat-admin.p5m b/components/web/tomcat-8/tomcat-admin.p5m index 1ade8f725..91d551c3f 100644 --- a/components/web/tomcat-8/tomcat-admin.p5m +++ b/components/web/tomcat-8/tomcat-admin.p5m @@ -48,7 +48,7 @@ file path=var/tomcat8/webapps/host-manager/WEB-INF/jsp/403.jsp 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/sessionDetail.jsp 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 --git a/components/web/tomcat-8/tomcat-examples.p5m b/components/web/tomcat-8/tomcat-examples.p5m index 05e749039..1dfb61851 100644 --- a/components/web/tomcat-8/tomcat-examples.p5m +++ b/components/web/tomcat-8/tomcat-examples.p5m @@ -42,14 +42,12 @@ set name=org.opensolaris.arc-caseid value=PSARC/2008/711 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 --git a/components/web/tomcat-8/tomcat.p5m b/components/web/tomcat-8/tomcat.p5m index bca0633eb..be44e50fe 100644 --- a/components/web/tomcat-8/tomcat.p5m +++ b/components/web/tomcat-8/tomcat.p5m @@ -153,8 +153,7 @@ file path=usr/tomcat8/docs/funcspecs/index.html 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/asf-logo.svg 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 -- 2.11.4.GIT