This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 5aa29c415ae666e26bfbdc84503b72c36e199586 Author: Emmanuel Bourg <[email protected]> Date: Thu Jan 16 00:08:51 2014 +0100 New upstream release (8.0.0-RC10) Refreshed the patches --- debian/changelog | 2 +- debian/patches/0001-set-UTF-8-as-default-character-encoding.patch | 2 +- debian/patches/0002-do-not-load-AJP13-connector-by-default.patch | 2 +- debian/patches/0003-disable-APR-library-loading.patch | 4 ++-- .../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++-- debian/patches/0005-skip-test-failures.patch | 6 +++--- debian/patches/0010-debianize-build-xml.patch | 4 ++-- .../patches/0013-dont-look-for-build-properties-in-user-home.patch | 2 +- debian/patches/0017-use-jdbc-pool-default.patch | 4 ++-- debian/patches/0018-fix-manager-webapp.patch | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index f55313b..bc013b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -tomcat8 (8.0.0~RC5-1) UNRELEASED; urgency=low +tomcat8 (8.0.0~RC10-1) UNRELEASED; urgency=low * Team upload. * New upstream release (Closes: #722675) diff --git a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch index 9695ae8..7cbdc8a 100644 --- a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch +++ b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch @@ -2,7 +2,7 @@ Description: Set UTF-8 as default character encoding Author: Thomas Koch <[email protected]> --- a/conf/server.xml +++ b/conf/server.xml -@@ -69,6 +69,7 @@ +@@ -67,6 +67,7 @@ --> <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" diff --git a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch index 6b6471e..fceffe1 100644 --- a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch +++ b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch @@ -2,7 +2,7 @@ Description: Do not load AJP13 connector by default Author: Thierry Carrez <[email protected]> --- a/conf/server.xml +++ b/conf/server.xml -@@ -89,7 +89,9 @@ +@@ -87,7 +87,9 @@ --> <!-- Define an AJP 1.3 Connector on port 8009 --> diff --git a/debian/patches/0003-disable-APR-library-loading.patch b/debian/patches/0003-disable-APR-library-loading.patch index 7f5cd6c..fd18f6f 100644 --- a/debian/patches/0003-disable-APR-library-loading.patch +++ b/debian/patches/0003-disable-APR-library-loading.patch @@ -9,6 +9,6 @@ Author: Thierry Carrez <[email protected]> + <!-- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + --> - <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> - <Listener className="org.apache.catalina.core.JasperListener" /> <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch index 6e7987a..53c739b 100644 --- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch +++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch @@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200 Subject: [PATCH] split deploy-webapps target from deploy target --- a/build.xml +++ b/build.xml -@@ -944,7 +944,7 @@ +@@ -962,7 +962,7 @@ </xslt> </target> @@ -12,7 +12,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target description="Default. Builds a working Tomcat instance"> <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" -@@ -982,6 +982,10 @@ +@@ -1000,6 +1000,10 @@ </fileset> </copy> diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch index 84d7bcc..a84eac7 100644 --- a/debian/patches/0005-skip-test-failures.patch +++ b/debian/patches/0005-skip-test-failures.patch @@ -3,10 +3,10 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -1268,8 +1268,10 @@ +@@ -1286,8 +1286,10 @@ <target name="test" description="Runs the JUnit test cases" - depends="test-bio,test-nio,test-apr" > + depends="test-bio,test-nio,test-apr,cobertura-report" > + <!-- <fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "FAILED".' /> <fail if="test.result.failure" message='Some tests completed with a Failure. See ${tomcat.build}/logs for details, search for "FAILED".' /> @@ -14,7 +14,7 @@ Forwarded: not-needed </target> <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors." -@@ -1305,7 +1307,7 @@ +@@ -1323,7 +1325,7 @@ description="The extension to use to distinguish the output"/> <sequential> diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index 6599dbb..763baad 100644 --- a/debian/patches/0010-debianize-build-xml.patch +++ b/debian/patches/0010-debianize-build-xml.patch @@ -5,7 +5,7 @@ Last-Update: 2011-05-16 --- a/build.xml +++ b/build.xml -@@ -604,7 +604,7 @@ +@@ -617,7 +617,7 @@ </copy> </target> @@ -14,7 +14,7 @@ Last-Update: 2011-05-16 <!-- Compile internal server components --> <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" -@@ -947,12 +947,14 @@ +@@ -965,12 +965,14 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps" description="Default. Builds a working Tomcat instance"> diff --git a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch index cb3ca94..e60d448 100644 --- a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch +++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch @@ -3,7 +3,7 @@ Date: Mon, 9 Jul 2012 20:53:38 +0000 Subject: 0013-dont-look-for-build-properties-in-user-home --- a/build.xml +++ b/build.xml -@@ -476,7 +476,6 @@ +@@ -489,7 +489,6 @@ <!-- Property that determines if manifests need updating --> <uptodate property="manifests.uptodate" targetfile="${tomcat.manifests}/default.manifest" > diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch index f45f147..ae7f5da 100644 --- a/debian/patches/0017-use-jdbc-pool-default.patch +++ b/debian/patches/0017-use-jdbc-pool-default.patch @@ -22,7 +22,7 @@ Forwarded: not-needed Package + ".OpenEjbFactory"; --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml -@@ -587,9 +587,7 @@ +@@ -589,9 +589,7 @@ <property name="javax.sql.DataSource.Factory"> <p>The class name of the factory to use to create resources of type <code>javax.sql.DataSource</code>. If not specified the default of @@ -35,7 +35,7 @@ Forwarded: not-needed <property name="javax.mail.Session.Factory"> --- a/webapps/docs/jndi-resources-howto.xml +++ b/webapps/docs/jndi-resources-howto.xml -@@ -658,7 +658,7 @@ +@@ -659,7 +659,7 @@ <p>The configuration properties for Tomcat's standard data source resource factory diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch index b044b13..1e3c733 100644 --- a/debian/patches/0018-fix-manager-webapp.patch +++ b/debian/patches/0018-fix-manager-webapp.patch @@ -12,7 +12,7 @@ Last-Update: 2013-08-01 -<Context docBase="${catalina.home}/webapps/manager" +<Context docBase="${catalina.home}/../tomcat8-admin/manager" - privileged="true" antiResourceLocking="false" antiJARLocking="false"> + privileged="true" antiResourceLocking="false" > </Context> --- a/webapps/docs/manager-howto.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
