0003232: Upgrade Jetty to the latest version. Require Java 8.

JumpMind · Aug 23, 2017 · ae4f7f8 · ae4f7f8
1 parent 2d70fc6
commit ae4f7f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle
@@ -194,7 +194,7 @@ subprojects { subproject ->
         bouncyCastleVersion = '140'
         animalSnifferVersion = '1.10'
         jnaVersion = '4.1.0'
-        jettyVersion = '9.4.5.v20170502'
+        jettyVersion = project.property('jetty.version')
         nuodbVersion = '2.6.1'
         tiberoVersion = '6'
         env = System.getenv()

diff --git a/symmetric-assemble/gradle.properties b/symmetric-assemble/gradle.properties
@@ -10,3 +10,4 @@ publishPassword=?
 publishServer=symmetricds.org
 sourceforgeUser=?
 sourceforgePassword=?
+jetty.version=9.4.6.v20170531
diff --git a/symmetric-server/build.gradle b/symmetric-server/build.gradle
@@ -31,7 +31,7 @@ apply from: symAssembleDir + '/asciidoc.gradle'
         provided "org.eclipse.jetty:jetty-servlets:$jettyVersion"
         provided "org.eclipse.jetty:jetty-webapp:$jettyVersion"
         provided "org.eclipse.jetty:jetty-jmx:$jettyVersion"
-        provided "javax.websocket:javax.websocket-api:1.0"
+        provided "javax.websocket:javax.websocket-api:1.1"
         provided "org.eclipse.jetty.websocket:javax-websocket-server-impl:$jettyVersion"        
         provided "mx4j:mx4j-tools:3.0.1"