Commit 9c224b12db0b7bbc25301e4ed6662a6e497c474d - tomcat9

+9

-3

debian/changelog less more

0		tomcat9 (9.0.65-2) UNRELEASED; urgency=medium
1
2		* Team upload.
	0	tomcat9 (9.0.67-1) UNRELEASED; urgency=medium
	1
	2	* Team upload.
	3
	4	[ Thorsten Glaser ]
3	5	* Fix a Policy violation in the Depends of bin:tomcat9
	6
	7	[ Emmanuel Bourg ]
	8	* New upstream release
	9	- Refreshed the patches
4	10
5	11	-- Thorsten Glaser <tg@mirbsd.de> Sun, 14 Aug 2022 19:08:29 +0200
6	12

+2

-2

debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch less more

2	2	Subject: [PATCH] split deploy-webapps target from deploy target
3	3	--- a/build.xml
4	4	+++ b/build.xml
5		@@ -1395,7 +1395,7 @@
	5	@@ -1406,7 +1406,7 @@
6	6	</xslt>
7	7	</target>
8	8

11	11	description="Default. Builds a working Tomcat instance">
12	12
13	13	<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
14		@@ -1429,6 +1429,10 @@
	14	@@ -1440,6 +1440,10 @@
15	15	</fileset>
16	16	</copy>
17	17

+1

-1

debian/patches/0005-skip-test-failures.patch less more

+2

-2

debian/patches/0010-debianize-build-xml.patch less more

9	9
10	10	--- a/build.xml
11	11	+++ b/build.xml
12		@@ -937,7 +937,7 @@
	12	@@ -948,7 +948,7 @@
13	13	</copy>
14	14	</target>
15	15

18	18	<!-- Compile internal server components -->
19	19	<javac srcdir="java" destdir="${tomcat.classes}"
20	20	debug="${compile.debug}"
21		@@ -1397,9 +1397,9 @@
	21	@@ -1408,9 +1408,9 @@
22	22
23	23	<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
24	24	description="Default. Builds a working Tomcat instance">

+1

-1

debian/patches/0013-dont-look-for-build-properties-in-user-home.patch less more

4	4	Forwarded: not-needed
5	5	--- a/build.xml
6	6	+++ b/build.xml
7		@@ -798,7 +798,6 @@
	7	@@ -809,7 +809,6 @@
8	8	<!-- Property that determines if manifests need updating -->
9	9	<uptodate property="manifests.uptodate"
10	10	targetfile="${tomcat.manifests}/default.manifest" >

+1

-1

debian/patches/0019-add-distribution-to-error-page.patch less more

15	15	\ No newline at end of file
16	16	--- a/build.xml
17	17	+++ b/build.xml
18		@@ -251,6 +251,7 @@
	18	@@ -255,6 +255,7 @@
19	19	<filter token="YEAR" value="${year}"/>
20	20	<filter token="VERSION" value="${version}"/>
21	21	<filter token="VERSION_NUMBER" value="${version.number}"/>

+5

-5

debian/patches/disable-jacoco.patch less more

8	8
9	9	--- a/build.xml
10	10	+++ b/build.xml
11		@@ -1824,7 +1824,7 @@
	11	@@ -1837,7 +1837,7 @@
12	12	<property name="junit.formatter.extension" value=".txt" />
13	13
14	14	<target name="test" description="Runs the JUnit test cases"

17	17
18	18	<target name="test-status"
19	19	description="Analyses logs directory and reports on skipped tests, test failures and test errors">
20		@@ -1919,10 +1919,6 @@
	20	@@ -1932,10 +1932,6 @@
21	21
22	22	<sequential>
23	23	<mkdir dir="${test.reports}" />

28	28	<junit printsummary="yes" fork="yes" dir="." showoutput="${test.verbose}"
29	29	errorproperty="test.result.error"
30	30	failureproperty="test.result.failure"
31		@@ -1994,7 +1990,6 @@
	31	@@ -2007,7 +2003,6 @@
32	32	<fileset dir="test" includes="**/SecurityManager.java" excludes="${test.exclude}" />
33	33	</batchtest>
34	34	</junit>

36	36	</sequential>
37	37	</macrodef>
38	38
39		@@ -2002,21 +1997,6 @@
	39	@@ -2015,21 +2010,6 @@
40	40	depends="test-nio,test-nio2,test-apr"
41	41	description="Creates report from gathered Code coverage results">
42	42

58	58	</target>
59	59
60	60	<target name="spotbugs"
61		@@ -3221,15 +3201,8 @@
	61	@@ -3358,15 +3338,8 @@
62	62	<path id="jacoco.classpath">
63	63	<fileset file="${jacoco.jar}" />
64	64	</path>

+1

-1

debian/patches/exclude-TestJNDIRealmIntegration.patch less more

11	11
12	12	--- a/build.xml
13	13	+++ b/build.xml
14		@@ -1807,6 +1807,7 @@
	14	@@ -1819,6 +1819,7 @@
15	15	<!-- Exclude these by default as Gump can't run them because the -->
16	16	<!-- classes on which they depend are not in any output JAR. -->
17	17	<exclude name="org/apache/tomcat/buildutil/**"/>