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

commit d4fe28eed8cc6d0223decf4145d09155d5a976a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jun 30 22:49:02 2019 +0100

    Since WebSocket requires Java 7, allow WebSocket to use Java 7 features.
    
    This will enable the diff between WebSocket in 8.5.x and 7.0.x to be
    minimised which will aid maintenance.
---
 build.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index bd11b70..639fa20 100644
--- a/build.xml
+++ b/build.xml
@@ -83,6 +83,9 @@
   <!-- 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 -->
@@ -704,8 +707,8 @@
     <javac sourcepath="" srcdir="java" destdir="${tomcat.classes}"
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           target="${compile.target}"
+           source="${compile.source.ws}"
+           target="${compile.target.ws}"
            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

Reply via email to