You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/11/15 21:19:27 UTC
[tomcat] branch 8.5.x updated (56fb7dc -> a86f15c)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 56fb7dc Improve changelog entry for BZ 63835
new b57136d Fix IDE auto-box warnings
new a86f15c Restore compile.release where it can be done without breaking the build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 5 +++++
test/org/apache/coyote/http11/TestHttp11Processor.java | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Restore compile.release where it can be done
without breaking the build
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a86f15c09a90182d659b87347d0114dde90a7056
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 15 20:51:59 2019 +0000
Restore compile.release where it can be done without breaking the build
---
build.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/build.xml b/build.xml
index ab3c012..029b0b8 100644
--- a/build.xml
+++ b/build.xml
@@ -87,6 +87,7 @@
<!-- Servlet 3.1 spec requires Java 7+ -->
<property name="compile.source" value="7"/>
<property name="compile.target" value="7"/>
+ <property name="compile.release" value="7"/>
<property name="min.java.version" value="7"/>
<!-- Locations to create the JAR artifacts -->
@@ -637,6 +638,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeAntRuntime="true" >
<!-- Uncomment this to show unchecked warnings:
@@ -1160,6 +1162,7 @@
debug="${compile.debug}" deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
classpath="${tomcat.classes}"
encoding="ISO-8859-1"
includeantruntime="false">
@@ -1171,6 +1174,7 @@
debug="${compile.debug}" deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
classpath="${tomcat.classes}"
encoding="ISO-8859-1"
includeantruntime="false">
@@ -1403,6 +1407,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="true">
<classpath refid="tomcat.test.classpath" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix IDE auto-box warnings
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b57136d4cddb7afc9a982764dd6163d7cb328ad5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 15 20:30:00 2019 +0000
Fix IDE auto-box warnings
---
test/org/apache/coyote/http11/TestHttp11Processor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java
index f3d7d8f..c0c26b3 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1560,8 +1560,8 @@ public class TestHttp11Processor extends TomcatBaseTest {
int maxKeepAliveRequests) throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setAttribute("keepAliveTimeout", keepAliveTimeout);
- tomcat.getConnector().setAttribute("maxKeepAliveRequests", maxKeepAliveRequests);
+ tomcat.getConnector().setAttribute("keepAliveTimeout", Integer.valueOf(keepAliveTimeout));
+ tomcat.getConnector().setAttribute("maxKeepAliveRequests", Integer.valueOf(maxKeepAliveRequests));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org