components/tomcat/patches/build.xml.patch
branchs11u3-sru
changeset 7317 bd14d5a59818
parent 5535 ae5bc52953a4
--- a/components/tomcat/patches/build.xml.patch	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/patches/build.xml.patch	Wed Nov 02 06:19:13 2016 -0700
@@ -7,7 +7,7 @@
 
 --- build.xml
 +++ build.xml
-@@ -515,13 +515,6 @@
+@@ -514,13 +514,6 @@
  
    <target name="deploy" depends="build-only,build-docs,warn.dbcp">
  
@@ -21,7 +21,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -956,42 +949,6 @@
+@@ -955,42 +948,6 @@
            description="Download (and build as necessary) dependent components"
            depends="build-manifests">
  
@@ -64,7 +64,7 @@
      <!-- Build Tomcat DBCP bundle -->
      <antcall target="downloadgz-2">
        <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
-@@ -1003,6 +960,11 @@
+@@ -1002,6 +959,11 @@
        <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
        <param name="destfile" value="${commons-dbcp.home}/build.xml" />
      </antcall>
@@ -76,7 +76,7 @@
      <mkdir dir="${tomcat-dbcp.home}"/>
      <antcall target="build-tomcat-dbcp" />
  
-@@ -1014,29 +976,9 @@
+@@ -1013,29 +975,9 @@
        <param name="destdir" value="${jdt.home}"/>
      </antcall>