[tomcat8] 04/09: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 16 13:48:59 UTC 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 4d21c9617cfc4d88e73642533801ddb02446831e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Feb 14 16:53:22 2018 +0100
Refreshed the patches
---
debian/changelog | 4 +-
...-deploy-webapps-target-from-deploy-target.patch | 6 +--
debian/patches/0005-skip-test-failures.patch | 2 +-
debian/patches/0010-debianize-build-xml.patch | 17 +++---
.../patches/0022-websocket-api-compatibility.patch | 61 ----------------------
debian/patches/series | 1 -
6 files changed, 14 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 068d0c5..7cd0b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-tomcat8 (8.5.24-3) UNRELEASED; urgency=medium
+tomcat8 (8.5.27-1) UNRELEASED; urgency=medium
+ * New upstream release
+ - Refreshed the patches
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
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 875c336..37b9355 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
-@@ -1006,7 +1006,7 @@
+@@ -1008,7 +1008,7 @@
</xslt>
</target>
@@ -11,8 +11,8 @@ Subject: [PATCH] split deploy-webapps target from deploy target
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
description="Default. Builds a working Tomcat instance">
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-@@ -1045,6 +1045,10 @@
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+@@ -1042,6 +1042,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index b763a1e..226f7fe 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1385,8 +1385,10 @@
+@@ -1384,8 +1384,10 @@
</filterchain>
</concat>
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index f4b7753..75a10c6 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -14,18 +14,15 @@ Last-Update: 2011-05-16
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -1009,12 +1009,14 @@
+@@ -1010,9 +1010,9 @@
+
<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
description="Default. Builds a working Tomcat instance">
-
-+ <!--
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
-
+-
++<!--
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
-+ -->
-
+-
++-->
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
diff --git a/debian/patches/0022-websocket-api-compatibility.patch b/debian/patches/0022-websocket-api-compatibility.patch
deleted file mode 100644
index bfe83c6..0000000
--- a/debian/patches/0022-websocket-api-compatibility.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Removes the new setDefaultAsyncSendTimeout method
- mistakenly added to WebSocketContainer interface in Tomcat 8.5.24
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: yes
---- a/java/javax/websocket/WebSocketContainer.java
-+++ b/java/javax/websocket/WebSocketContainer.java
-@@ -37,16 +37,8 @@
- * @deprecated This will be removed in Tomcat 9.
- * Use {@link #setDefaultAsyncSendTimeout(long)}
- */
-- @Deprecated
- void setAsyncSendTimeout(long timeout);
-
-- /**
-- * Set the default timeout for sending a message asynchronously.
-- * @param timeout The new default timeout in milliseconds. A non-positive
-- * value means an infinite timeout.
-- */
-- void setDefaultAsyncSendTimeout(long timeout);
--
- Session connectToServer(Object endpoint, URI path)
- throws DeploymentException, IOException;
-
---- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
-+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
-@@ -986,7 +986,6 @@
- * The default value for this implementation is -1.
- */
- @Override
-- @Deprecated
- public void setAsyncSendTimeout(long timeout) {
- this.defaultAsyncTimeout = timeout;
- }
-@@ -997,7 +996,6 @@
- *
- * The default value for this implementation is -1.
- */
-- @Override
- public void setDefaultAsyncSendTimeout(long timeout) {
- this.defaultAsyncTimeout = timeout;
- }
---- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
-+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
-@@ -325,7 +325,7 @@
-
- // Set the async timeout
- if (setTimeoutOnContainer) {
-- wsContainer.setDefaultAsyncSendTimeout(TIMEOUT_MS);
-+ wsContainer.setAsyncSendTimeout(TIMEOUT_MS);
- }
-
- tomcat.start();
-@@ -606,7 +606,7 @@
- sc.addEndpoint(ServerEndpointConfig.Builder.create(
- ConstantTxEndpoint.class, PATH).build());
- if (TestWsWebSocketContainer.timeoutOnContainer) {
-- sc.setDefaultAsyncSendTimeout(TIMEOUT_MS);
-+ sc.setAsyncSendTimeout(TIMEOUT_MS);
- }
- } catch (DeploymentException e) {
- throw new IllegalStateException(e);
diff --git a/debian/patches/series b/debian/patches/series
index 41676a7..1b36989 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
0018-fix-manager-webapp.patch
0019-add-distribution-to-error-page.patch
0021-dont-test-unsupported-ciphers.patch
-0022-websocket-api-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list