Author: markt Date: Sun Mar 13 21:23:17 2016 New Revision: 1734860 URL: http://svn.apache.org/viewvc?rev=1734860&view=rev Log: More version fixes for 8.5
Modified: tomcat/tc8.5.x/trunk/build.xml tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Modified: tomcat/tc8.5.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734860&r1=1734859&r2=1734860&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/build.xml (original) +++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 21:23:17 2016 @@ -44,7 +44,7 @@ <property name="md5sum.binary-prefix" value=" *" /> <!-- Exact spec versions (for the manifests) --> - <property name="servlet.revision" value="EDR-b01" /> + <property name="servlet.revision" value="FR" /> <property name="jsp.revision" value="FR" /> <property name="el.revision" value="FR" /> <property name="websocket.revision" value="FR" /> @@ -710,7 +710,7 @@ filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - <!-- Servlet 4.0 Implementation JAR File --> + <!-- Servlet 3.1 Implementation JAR File --> <jarIt jarfile="${servlet-api.jar}" filesDir="${tomcat.classes}" filesId="files.servlet-api" @@ -1945,9 +1945,9 @@ Apache Tomcat ${version} native binaries sourcepath="${tomcat.dist}/src/java" destdir="${tomcat.dist}/webapps/docs/servletapi" version="true" - windowtitle="Servlet 4.0 API Documentation - Apache Tomcat ${version}" - doctitle="Servlet 4.0 API - Apache Tomcat ${version}" - header="<b>Servlet 4.0 - Apache Tomcat ${version}</b>" + windowtitle="Servlet 3.1 API Documentation - Apache Tomcat ${version}" + doctitle="Servlet 3.1 API - Apache Tomcat ${version}" + header="<b>Servlet 3.1 - Apache Tomcat ${version}</b>" bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved." encoding="UTF-8" docencoding="UTF-8" @@ -2624,7 +2624,7 @@ skip.installer property in build.propert filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - <!-- Servlet 4.0 Implementation JAR File --> + <!-- Servlet 3.1 Implementation JAR File --> <jarIt jarfile="${servlet-api-src.jar}" filesDir="java" filesId="files.servlet-api" Modified: tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml?rev=1734860&r1=1734859&r2=1734860&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml (original) +++ tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml Sun Mar 13 21:23:17 2016 @@ -18,8 +18,8 @@ <web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd" - version="4.0" + http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd" + version="3.1" metadata-complete="true"> <name>org_apache_jasper</name> <distributable/> Modified: tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license?rev=1734860&r1=1734859&r2=1734860&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license (original) +++ tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license Sun Mar 13 21:23:17 2016 @@ -228,10 +228,6 @@ For the following XML Schemas for Java E - web-app_3_1.xsd - web-common_3_1.xsd - web-fragment_3_1.xsd - - javaee_8.xsd - - web-app_4_0.xsd - - web-common_4_0.xsd - - web-fragment_4_0.xsd COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest?rev=1734860&r1=1734859&r2=1734860&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest (original) +++ tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest Sun Mar 13 21:23:17 2016 @@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/ Specification-Title: Java API for Servlets -Specification-Version: 4.0 +Specification-Version: 3.1 Specification-Vendor: Sun Microsystems, Inc. Implementation-Title: javax.servlet -Implementation-Version: 4.0.@servlet.revision@ +Implementation-Version: 3.1.@servlet.revision@ Implementation-Vendor: Apache Software Foundation Modified: tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice?rev=1734860&r1=1734859&r2=1734860&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice (original) +++ tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice Sun Mar 13 21:23:17 2016 @@ -22,10 +22,6 @@ The original XML Schemas for Java EE Dep - web-app_3_1.xsd - web-common_3_1.xsd - web-fragment_3_1.xsd - - javaee_8.xsd - - web-app_4_0.xsd - - web-common_4_0.xsd - - web-fragment_4_0.xsd may be obtained from: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html Modified: tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1734860&r1=1734859&r2=1734860&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original) +++ tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Sun Mar 13 21:23:17 2016 @@ -18,8 +18,8 @@ <web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd" - version="4.0" + http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd" + version="3.1" metadata-complete="true"> <name>org_apache_tomcat_websocket</name> <distributable/> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org