This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 29ddfaf Revert d4fe28e. It breaks the WebSocket SCI on Java 6.
29ddfaf is described below
commit 29ddfaf1d37ad4126813e312f3861a27faef0b26
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jun 30 23:01:23 2019 +0100
Revert d4fe28e. It breaks the WebSocket SCI on Java 6.
---
build.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index 639fa20..bd11b70 100644
--- a/build.xml
+++ b/build.xml
@@ -83,9 +83,6 @@
<!-- Servlet 3.0 spec requires 1.6+ -->
<property name="compile.source" value="1.6"/>
<property name="compile.target" value="1.6"/>
- <!-- WebSocket 1.1 spec requires 1.7+ -->
- <property name="compile.source.ws" value="1.7"/>
- <property name="compile.target.ws" value="1.7"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -707,8 +704,8 @@
<javac sourcepath="" srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- source="${compile.source.ws}"
- target="${compile.target.ws}"
+ source="${compile.source}"
+ target="${compile.target}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
