1 |
commit: dbfb5c45e92dd153733fffe84334dd3120c82142 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sun Oct 30 08:01:26 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 30 09:27:36 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbfb5c45 |
7 |
|
8 |
www-servers/tomcat: remove unused file |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/28038 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../tomcat/files/tomcat-10.0.20-build.xml.patch | 347 --------------------- |
15 |
1 file changed, 347 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch |
18 |
deleted file mode 100644 |
19 |
index 7332c570160a..000000000000 |
20 |
--- a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch |
21 |
+++ /dev/null |
22 |
@@ -1,347 +0,0 @@ |
23 |
-diff --git a/build.xml b/build.xml |
24 |
-index 72e49ad..8ff8ecc 100644 |
25 |
---- a/build.xml |
26 |
-+++ b/build.xml |
27 |
-@@ -1030,6 +1030,7 @@ |
28 |
- addOSGi="true" /> |
29 |
- |
30 |
- <!-- Servlet Implementation JAR File --> |
31 |
-+<!-- |
32 |
- <jarIt jarfile="${servlet-api.jar}" |
33 |
- filesDir="${tomcat.classes}" |
34 |
- filesId="files.servlet-api" |
35 |
-@@ -1037,21 +1038,23 @@ |
36 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
37 |
- license="${tomcat.manifests}/servlet-api.jar.license" |
38 |
- addOSGi="true" /> |
39 |
-- |
40 |
-+--> |
41 |
- <!-- EL Implementation JAR File --> |
42 |
-+<!-- |
43 |
- <jarIt jarfile="${el-api.jar}" |
44 |
- filesDir="${tomcat.classes}" |
45 |
- filesId="files.el-api" |
46 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" |
47 |
- addOSGi="true" /> |
48 |
-- |
49 |
-+--> |
50 |
- <!-- JSP Implementation JAR File --> |
51 |
-+<!-- |
52 |
- <jarIt jarfile="${jsp-api.jar}" |
53 |
- filesDir="${tomcat.classes}" |
54 |
- filesId="files.jsp-api" |
55 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
56 |
- addOSGi="true" /> |
57 |
-- |
58 |
-+--> |
59 |
- <!-- WebSocket API JAR File --> |
60 |
- <jarIt jarfile="${websocket-api.jar}" |
61 |
- filesDir="${tomcat.classes}" |
62 |
-@@ -1164,10 +1167,10 @@ |
63 |
- addOSGi="true" /> |
64 |
- |
65 |
- <!-- Re-packaged Apache Commons DBCP 2--> |
66 |
-- <jarIt jarfile="${tomcat-dbcp.jar}" |
67 |
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" |
68 |
- filesDir="${tomcat.classes}" |
69 |
- filesId="files.tomcat-dbcp" |
70 |
-- addOSGi="true" /> |
71 |
-+ addOSGi="true" /> --> |
72 |
- |
73 |
- <!-- i18n JARs --> |
74 |
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" |
75 |
-@@ -1404,9 +1407,9 @@ |
76 |
- |
77 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
78 |
- description="Default. Builds a working Tomcat instance"> |
79 |
-- |
80 |
-+<!-- |
81 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
82 |
-- |
83 |
-+--> |
84 |
- <!-- Copy scripts --> |
85 |
- <copy todir="${tomcat.build}/bin"> |
86 |
- <fileset dir="bin"> |
87 |
-@@ -1466,7 +1469,7 @@ |
88 |
- <exclude name="${jdt.jar.filename}"/> |
89 |
- </fileset> |
90 |
- </delete> |
91 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
92 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
93 |
- |
94 |
- <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one --> |
95 |
- <local name="migration.jar.filename" /> |
96 |
-@@ -1477,7 +1480,7 @@ |
97 |
- <exclude name="${migration-lib.jar.filename}"/> |
98 |
- </fileset> |
99 |
- </delete> |
100 |
-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> |
101 |
-+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> --> |
102 |
- |
103 |
- <!-- Add sources for examples --> |
104 |
- <antcall target="examples-sources" /> |
105 |
-@@ -1506,7 +1509,7 @@ |
106 |
- |
107 |
- </target> |
108 |
- |
109 |
-- <target name="build-tomcat-jdbc" depends="package"> |
110 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
111 |
- <!-- build the jdbc-pool jar and source jar--> |
112 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
113 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
114 |
-@@ -1522,7 +1525,7 @@ |
115 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
116 |
- </target> |
117 |
- |
118 |
-- <target name="build-tomcat-jdbc-src"> |
119 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
120 |
- <!-- build the jdbc-pool source jar--> |
121 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
122 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
123 |
-@@ -1625,9 +1628,11 @@ |
124 |
- |
125 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
126 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
127 |
-+<!-- |
128 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
129 |
- failonerror="false"/> |
130 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
131 |
-+--> |
132 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
133 |
- |
134 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
135 |
-@@ -2131,11 +2136,12 @@ |
136 |
- </copy> |
137 |
- |
138 |
- <!-- Source bundles for native components --> |
139 |
-+<!-- |
140 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
141 |
- file="${tomcat-native.tar.gz}" /> |
142 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
143 |
- file="${commons-daemon.native.src.tgz}" /> |
144 |
-- |
145 |
-+--> |
146 |
- <!-- platform README files --> |
147 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
148 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
149 |
-@@ -2159,13 +2165,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
150 |
- additionalparam="-breakiterator -notimestamp -html5" |
151 |
- source="${compile.release}" |
152 |
- maxmemory="512m" |
153 |
-- failonerror="true" |
154 |
-- failonwarning="true"> |
155 |
-+ failonerror="true"> |
156 |
- <classpath> |
157 |
- <path refid="compile.classpath"/> |
158 |
- <path location="${ant.core.lib}"/> |
159 |
- </classpath> |
160 |
- </javadoc> |
161 |
-+<!-- |
162 |
- <javadoc packagenames="jakarta.servlet.*" |
163 |
- excludepackagenames="jakarta.servlet.jsp.*" |
164 |
- sourcepath="${tomcat.dist}/src/java" |
165 |
-@@ -2181,8 +2187,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
166 |
- additionalparam="-breakiterator -notimestamp -html5" |
167 |
- source="${compile.release}" |
168 |
- maxmemory="512m" |
169 |
-- failonerror="true" |
170 |
-- failonwarning="true"> |
171 |
-+ failonerror="true"> |
172 |
- <classpath> |
173 |
- <path refid="compile.classpath"/> |
174 |
- <path location="${ant.core.lib}"/> |
175 |
-@@ -2202,8 +2207,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
176 |
- additionalparam="-breakiterator -notimestamp -html5" |
177 |
- source="${compile.release}" |
178 |
- maxmemory="512m" |
179 |
-- failonerror="true" |
180 |
-- failonwarning="true"> |
181 |
-+ failonerror="true"> |
182 |
- <classpath> |
183 |
- <path refid="compile.classpath"/> |
184 |
- <path location="${ant.core.lib}"/> |
185 |
-@@ -2223,13 +2227,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
186 |
- additionalparam="-breakiterator -notimestamp -html5" |
187 |
- source="${compile.release}" |
188 |
- maxmemory="512m" |
189 |
-- failonerror="true" |
190 |
-- failonwarning="true"> |
191 |
-+ failonerror="true"> |
192 |
- <classpath> |
193 |
- <path refid="compile.classpath"/> |
194 |
- <path location="${ant.core.lib}"/> |
195 |
- </classpath> |
196 |
- </javadoc> |
197 |
-+--> |
198 |
- <javadoc packagenames="jakarta.websocket.*" |
199 |
- sourcepath="${tomcat.dist}/src/java" |
200 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
201 |
-@@ -2244,8 +2248,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
202 |
- additionalparam="-breakiterator -notimestamp -html5" |
203 |
- source="${compile.release}" |
204 |
- maxmemory="512m" |
205 |
-- failonerror="true" |
206 |
-- failonwarning="true"> |
207 |
-+ failonerror="true"> |
208 |
- <classpath> |
209 |
- <path refid="compile.classpath"/> |
210 |
- <path location="${ant.core.lib}"/> |
211 |
-@@ -2264,8 +2267,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
212 |
- charset="UTF-8" |
213 |
- additionalparam="-breakiterator -notimestamp -html5" |
214 |
- maxmemory="512m" |
215 |
-- failonerror="true" |
216 |
-- failonwarning="true"> |
217 |
-+ failonerror="true"> |
218 |
- <classpath> |
219 |
- <path refid="compile.classpath"/> |
220 |
- <path location="${ant.core.lib}"/> |
221 |
-@@ -2284,20 +2286,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
222 |
- additionalparam="-breakiterator -notimestamp -html5" |
223 |
- source="${compile.release}" |
224 |
- maxmemory="512m" |
225 |
-- failonerror="true" |
226 |
- failonwarning="true"> |
227 |
- <classpath> |
228 |
- <path refid="compile.classpath"/> |
229 |
- <path location="${ant.core.lib}"/> |
230 |
- </classpath> |
231 |
- <link href="../annotationapi"/> |
232 |
-+<!-- |
233 |
- <link href="../servletapi"/> |
234 |
- <link href="../jspapi"/> |
235 |
- <link href="../elapi"/> |
236 |
-+--> |
237 |
- <link href="../websocketapi"/> |
238 |
- <link href="../jaspicapi"/> |
239 |
-+<!-- |
240 |
- <link href="https://docs.oracle.com/javase/8/docs/api/"/> |
241 |
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/> |
242 |
-+--> |
243 |
- <packageset dir="${tomcat.dist}/src/java/"> |
244 |
- <include name="org/**"/> |
245 |
- <exclude name="org/apache/el/parser/**"/> |
246 |
-@@ -3134,7 +3139,7 @@ skip.installer property in build.properties" /> |
247 |
- </target> |
248 |
- |
249 |
- <target name="download-test-compile" |
250 |
-- description="Download additional components for the tests" > |
251 |
-+ description="Download additional components for the tests"> |
252 |
- |
253 |
- <antcall target="downloadfile"> |
254 |
- <param name="sourcefile" value="${junit.loc}"/> |
255 |
-@@ -3262,7 +3267,7 @@ skip.installer property in build.properties" /> |
256 |
- </target> |
257 |
- |
258 |
- <target name="download-dist" |
259 |
-- description="Download additional components for a distribution" > |
260 |
-+ description="Download additional components for a distribution"> |
261 |
- |
262 |
- <antcall target="downloadfile-2"> |
263 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
264 |
-@@ -3317,13 +3322,13 @@ skip.installer property in build.properties" /> |
265 |
- |
266 |
- <!-- =============== Utility Targets to support downloads ================ --> |
267 |
- |
268 |
-- <target name="setproxy" if="${proxy.use}"> |
269 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
270 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
271 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
272 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
273 |
- </target> |
274 |
- |
275 |
-- <target name="testexist"> |
276 |
-+ <target name="testexist" unless="noget"> |
277 |
- <echo message="Testing for ${destfile}"/> |
278 |
- <available file="${destfile}" property="exist"/> |
279 |
- </target> |
280 |
-@@ -3445,7 +3450,7 @@ skip.installer property in build.properties" /> |
281 |
- </sequential> |
282 |
- </macrodef> |
283 |
- |
284 |
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
285 |
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
286 |
- <!-- Download and extract the package --> |
287 |
- <local name="temp.file"/> |
288 |
- <mkdir dir="${base.path}"/> |
289 |
-@@ -3462,7 +3467,7 @@ skip.installer property in build.properties" /> |
290 |
- <delete file="${temp.file}.tar.gz"/> |
291 |
- </target> |
292 |
- |
293 |
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> |
294 |
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> |
295 |
- <!-- Download and extract the package from the two alternative locations --> |
296 |
- <local name="temp.file"/> |
297 |
- <mkdir dir="${base.path}"/> |
298 |
-@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" /> |
299 |
- <delete file="${temp.file}.tar.gz"/> |
300 |
- </target> |
301 |
- |
302 |
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
303 |
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
304 |
- <!-- Download and extract the package --> |
305 |
- <local name="temp.file"/> |
306 |
- <mkdir dir="${base.path}"/> |
307 |
-@@ -3503,7 +3508,7 @@ skip.installer property in build.properties" /> |
308 |
- <delete file="${temp.file}"/> |
309 |
- </target> |
310 |
- |
311 |
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> |
312 |
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> |
313 |
- <!-- Download and extract the package from the two alternative locations --> |
314 |
- <local name="temp.file"/> |
315 |
- <mkdir dir="${base.path}"/> |
316 |
-@@ -3527,7 +3532,7 @@ skip.installer property in build.properties" /> |
317 |
- <delete file="${temp.file}"/> |
318 |
- </target> |
319 |
- |
320 |
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
321 |
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
322 |
- <!-- Download the file --> |
323 |
- <local name="temp.file"/> |
324 |
- <mkdir dir="${base.path}"/> |
325 |
-@@ -3542,7 +3547,7 @@ skip.installer property in build.properties" /> |
326 |
- <move file="${temp.file}" tofile="${destfile}"/> |
327 |
- </target> |
328 |
- |
329 |
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> |
330 |
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> |
331 |
- <!-- Download the file from the two alternative locations --> |
332 |
- <local name="temp.file"/> |
333 |
- <mkdir dir="${base.path}"/> |
334 |
-@@ -3570,7 +3575,7 @@ skip.installer property in build.properties" /> |
335 |
- <move file="${temp.file}" tofile="${destfile}"/> |
336 |
- </target> |
337 |
- |
338 |
-- <target name="trydownload.check" depends="setproxy"> |
339 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
340 |
- <condition property="trydownload.run"> |
341 |
- <and> |
342 |
- <not> |
343 |
-@@ -3581,7 +3586,7 @@ skip.installer property in build.properties" /> |
344 |
- </condition> |
345 |
- </target> |
346 |
- |
347 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
348 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
349 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
350 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
351 |
- </target> |
352 |
-@@ -3592,7 +3597,7 @@ skip.installer property in build.properties" /> |
353 |
- |
354 |
- <target name="ide-eclipse" |
355 |
- depends="download-compile, download-test-compile" |
356 |
-- description="Prepares the source tree to be built in Eclipse"> |
357 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
358 |
- |
359 |
- <!-- Copy the sample project files into the root directory --> |
360 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
361 |
-@@ -3610,7 +3615,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho |
362 |
- |
363 |
- <target name="ide-intellij" |
364 |
- depends="download-compile, download-test-compile" |
365 |
-- description="Creates project directory .idea for IntelliJ IDEA"> |
366 |
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> |
367 |
- |
368 |
- <copy todir="${tomcat.home}/.idea"> |
369 |
- <fileset dir="${tomcat.home}/res/ide-support/idea"/> |