From 872c4690973ad6c3322b8694ed103bbd65f8d7e9 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 27 Aug 2015 10:57:42 +0300 Subject: [PATCH] Update to 8.0.26. --- jasper-OSGi-MANIFEST.MF | 22 +++++++++++----------- jasper-el-OSGi-MANIFEST.MF | 2 +- sources | 2 +- tomcat-api-OSGi-MANIFEST.MF | 4 ++-- tomcat-juli-OSGi-MANIFEST.MF | 6 +++--- tomcat.spec | 7 +++++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/jasper-OSGi-MANIFEST.MF b/jasper-OSGi-MANIFEST.MF index 9a3d98a..ad34978 100644 --- a/jasper-OSGi-MANIFEST.MF +++ b/jasper-OSGi-MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 -Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c - ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version - ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas - per.runtime;version="7.0.21",org.apache.jasper.security;version="7.0. - 19",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp - lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v - ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja - sper.xmlparser;version="7.0.21" +Export-Package: org.apache.jasper;version="8.0.26",org.apache.jasper.c + ompiler;version="8.0.26",org.apache.jasper.compiler.tagplugin;version + ="8.0.26",org.apache.jasper.resources;version="8.0.26",org.apache.jas + per.runtime;version="8.0.26",org.apache.jasper.security;version="7.0. + 19",org.apache.jasper.servlet;version="8.0.26",org.apache.jasper.tagp + lugins.jstl;version="8.0.26",org.apache.jasper.tagplugins.jstl.core;v + ersion="8.0.26",org.apache.jasper.util;version="8.0.26",org.apache.ja + sper.xmlparser;version="8.0.26" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Localization: plugin Bundle-Name: %bundleName Bundle-ManifestVersion: 2 @@ -24,8 +24,8 @@ Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util; resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml. - sax.helpers,org.apache.tomcat;version="7.0.21",org.apache.juli.loggin - g;version="7.0.21",javax.el;version="2.2.0",org.eclipse.jdt.internal. + sax.helpers,org.apache.tomcat;version="8.0.26",org.apache.juli.loggin + g;version="8.0.26",javax.el;version="2.2.0",org.eclipse.jdt.internal. compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp diff --git a/jasper-el-OSGi-MANIFEST.MF b/jasper-el-OSGi-MANIFEST.MF index fd2879f..14e4282 100644 --- a/jasper-el-OSGi-MANIFEST.MF +++ b/jasper-el-OSGi-MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Export-Package: org.apache.el;version="7.0.21" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/sources b/sources index 9e1f56d..a36c73e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1184955015a2290252f0ec9495640b23 apache-tomcat-8.0.24-src.tar.gz +866415a62d9f5ba0422cad7d890ab35a apache-tomcat-8.0.26-src.tar.gz diff --git a/tomcat-api-OSGi-MANIFEST.MF b/tomcat-api-OSGi-MANIFEST.MF index 3522c72..85b12b8 100644 --- a/tomcat-api-OSGi-MANIFEST.MF +++ b/tomcat-api-OSGi-MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 -Export-Package: org.apache.tomcat;version="7.0.21" +Export-Package: org.apache.tomcat;version="8.0.26" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/tomcat-juli-OSGi-MANIFEST.MF b/tomcat-juli-OSGi-MANIFEST.MF index cbb5674..b856d9f 100644 --- a/tomcat-juli-OSGi-MANIFEST.MF +++ b/tomcat-juli-OSGi-MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 -Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi - ng;version="7.0.21" +Export-Package: org.apache.juli;version="8.0.26",org.apache.juli.loggi + ng;version="8.0.26" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . -Bundle-Version: 7.0.21 +Bundle-Version: 8.0.26 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/tomcat.spec b/tomcat.spec index b052f87..7a661c0 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 8 %global minor_version 0 -%global micro_version 24 +%global micro_version 26 %global packdname apache-tomcat-%{version}-src %global servletspec 3.1 %global elspec 3.0 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -686,6 +686,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1 +- Update to 8.0.26. + * Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2 - Update to 8.0.24.