up to 7.0.63, build still fails

diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index 7540f5d52f5fb8cae898d23d02c503d041d06e55..b4b4e2dafec1b8d7d01e4284263112c9532bc94c 100644 (file)
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -1,68 +1,7 @@
---- apache-tomcat-7.0.52-src/build.xml.orig    2014-02-13 08:40:56.000000000 +0100
-+++ apache-tomcat-7.0.52-src/build.xml 2014-02-28 11:21:53.676705236 +0100
-@@ -482,60 +482,6 @@
-     
-   </target>
- 
--  <target name="validate" if="${execute.validate}"
--    depends="build-prepare,compile-prepare,download-validate"
--    description="Uses Checkstyle tool to perform style check for the source code">
--    <!-- Required so we can cache checkstyle results -->
--    <mkdir dir="${tomcat.output}/res/checkstyle"/>
--
--    <taskdef resource="checkstyletask.properties"
--             classpath="${checkstyle.jar}" />
--    <checkstyle config="res/checkstyle/checkstyle.xml">
--      <fileset dir="." >
--        <patternset refid="text.files" />
--        <include name="**/*.bat"/>
--        <include name="**/*.sh"/>
--        <exclude name="bin/setenv.*"/>
--        <exclude name=".*/**"/>
--        <exclude name="output/**"/>
--        <exclude name="modules/**"/>
--        <exclude name="**/*.mdl"/>
--        <exclude name="**/*_2.xml"/>
--        <exclude name="res/checkstyle/header-al2.txt"/>
--        <!-- Exclude auto-generated files -->
--        <exclude name="java/org/apache/el/parser/ELParser*.java" />
--        <exclude name="java/org/apache/el/parser/Node.java" />
--        <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
--        <exclude name="java/org/apache/**/parser/ParseException.java" />
--        <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
--        <exclude name="java/org/apache/**/parser/Token*.java" />
--        <!-- Exclude these else Gump runs validate on them -->
--        <exclude name="**/org/apache/tomcat/dbcp/**"/>
--        <exclude name="**/tomcat-deps/**"/>
--        <!-- Exclude simple test files -->
--        <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
--        <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
--      </fileset>
--      <fileset dir="modules/jdbc-pool" >
--        <exclude name=".*/**"/>
--        <exclude name="**/MANIFEST.MF"/>
--        <patternset refid="text.files" />
--      </fileset>
--    </checkstyle>
--    <!-- javax package checks -->
--    <checkstyle config="res/checkstyle/javax-checkstyle.xml">
--      <fileset dir="java/javax" >
--        <include name="**/*.java"/>
--      </fileset>
--    </checkstyle>
--    <!-- org package checks -->
--    <checkstyle config="res/checkstyle/org-checkstyle.xml">
--      <fileset dir="java/org" >
--        <include name="**/*.java"/>
--      </fileset>
--    </checkstyle>
--  </target>
--
-   <target name="validate-eoln" depends="build-prepare,compile-prepare"
-     description="Validate that the source files have correct line ends">
- 
-@@ -595,7 +541,7 @@
-   <target name="compile" depends="compile-java6,compile-java7" />
+--- apache-tomcat-7.0.63-src/build.xml~        2015-06-30 11:15:44.000000000 +0300
++++ apache-tomcat-7.0.63-src/build.xml 2015-07-26 21:31:46.613106110 +0300
+@@ -632,7 +574,7 @@
+   <target name="compile" depends="compile-java6,check-java7,compile-java7" />
  
    <target name="compile-java6"
 -          depends="build-prepare,download-compile,compile-prepare,validate">

diff --git a/tomcat.spec b/tomcat.spec
index 8aef3132c94aa4f94b06a2ff1b66f7f3d5182cd5..50f272ea52843e0d0807123fec7f0591d1e63246 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -14,12 +14,12 @@
 Summary:       Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
 Summary(pl.UTF-8):     Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:          tomcat
-Version:       7.0.55
+Version:       7.0.63
 Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 3297f4d0a9834711c2f552096859c23e
+# Source0-md5: 29fbc490b99140a671e4c84d152caee7
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties