← Back to branch summary

~ubuntu-branches/ubuntu/saucy/tomcat7/saucy

« back to all changes in this revision

Viewing changes to .pc/0010-debianize-build-xml.patch/build.xml

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-12-06 13:47:08 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20121206134708-xub74b3086g2xwt3
Tags: 7.0.34-0ubuntu1
https://launchpad.net/bugs/1071817
* New upstream release.
  - d/p/0014-fix-override.patch: Fix FTBFS due to differing dependency
    versions compared to upstream.
* d/p/0015-use-jdbc-pool-default.patch: Make jdbc-pool module the default
  pool implementation for DataSources (LP: #1071817).

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0010-debianize-build-xml.patch/build.xml
462
462
        <!-- Exclude auto-generated files -->
463
463
        <exclude name="java/org/apache/el/parser/ELParser*.java" />
464
464
        <exclude name="java/org/apache/el/parser/Node.java" />
465
 
        <exclude name="java/org/apache/tomcat/util/http/parser/HttpParser*.java" />
466
465
        <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
467
466
        <exclude name="java/org/apache/**/parser/ParseException.java" />
468
467
        <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
471
470
        <exclude name="**/org/apache/tomcat/dbcp/**"/>
472
471
        <exclude name="**/tomcat-deps/**"/>
473
472
        <!-- Exclude simple test files -->
474
 
        <exclude name="test/webapp-3.0/bug53257/*.txt"/>
 
473
        <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
475
474
        <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
476
475
      </fileset>
477
476
      <fileset dir="modules/jdbc-pool" >