From 9c30a1f8dfa57370b3892112c130f1695610179f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 8 Apr 2016 16:16:29 +0200 Subject: [PATCH] Latest dependency updates (EhCache 3.0 RC3, Undertow 1.3.21) (cherry picked from commit e365ffb) --- build.gradle | 96 ++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/build.gradle b/build.gradle index 1b71b631d3..ba3dba33cf 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ configure(allprojects) { project -> ext.eclipselinkVersion = "2.4.2" ext.ehcacheVersion = "2.10.1" ext.ehcachejcacheVersion = "1.0.1" - ext.ehcache3Version = "3.0.0.rc2" + ext.ehcache3Version = "3.0.0.rc3" ext.ejbApiVersion = "3.0" ext.fileuploadVersion = "1.3.1" ext.freemarkerVersion = "2.3.23" @@ -74,7 +74,7 @@ configure(allprojects) { project -> ext.tiles3Version = "3.0.5" ext.tomcatVersion = "8.0.33" ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support - ext.undertowVersion = "1.3.20.Final" + ext.undertowVersion = "1.3.21.Final" ext.woodstoxVersion = "5.0.2" ext.xmlunitVersion = "1.6" ext.xstreamVersion = "1.4.9" @@ -739,52 +739,6 @@ project("spring-web") { } } -project("spring-websocket") { - description = "Spring WebSocket" - - dependencies { - compile(project(":spring-core")) - compile(project(":spring-context")) - compile(project(":spring-web")) - optional(project(":spring-messaging")) - optional(project(":spring-webmvc")) - optional("javax.servlet:javax.servlet-api:3.1.0") - optional("javax.websocket:javax.websocket-api:1.0") - optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") { - exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" - exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" - } - optional("org.glassfish.tyrus:tyrus-spi:${tyrusVersion}") - optional("org.glassfish.tyrus:tyrus-core:${tyrusVersion}") - optional("org.glassfish.tyrus:tyrus-server:${tyrusVersion}") - optional("org.glassfish.tyrus:tyrus-container-servlet:${tyrusVersion}") - optional("org.eclipse.jetty:jetty-webapp:${jettyVersion}") { - exclude group: "javax.servlet", module: "javax.servlet" - } - optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") { - exclude group: "javax.servlet", module: "javax.servlet" - } - optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}") - optional("org.eclipse.jetty:jetty-client:${jettyVersion}") - optional("io.undertow:undertow-core:${undertowVersion}") - optional("io.undertow:undertow-servlet:${undertowVersion}") { - exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_3.1_spec" - exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec" - } - optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { - exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" - } - optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") - testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") - testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") - testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}") - testCompile("io.projectreactor:reactor-net:${reactorVersion}") - testCompile("io.netty:netty-all:${nettyVersion}") - testCompile("log4j:log4j:1.2.17") - testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") - } -} - project("spring-orm") { description = "Spring Object/Relational Mapping" @@ -991,6 +945,52 @@ project("spring-webmvc-portlet") { } } +project("spring-websocket") { + description = "Spring WebSocket" + + dependencies { + compile(project(":spring-core")) + compile(project(":spring-context")) + compile(project(":spring-web")) + optional(project(":spring-messaging")) + optional(project(":spring-webmvc")) + optional("javax.servlet:javax.servlet-api:3.1.0") + optional("javax.websocket:javax.websocket-api:1.0") + optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") { + exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" + exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" + } + optional("org.glassfish.tyrus:tyrus-spi:${tyrusVersion}") + optional("org.glassfish.tyrus:tyrus-core:${tyrusVersion}") + optional("org.glassfish.tyrus:tyrus-server:${tyrusVersion}") + optional("org.glassfish.tyrus:tyrus-container-servlet:${tyrusVersion}") + optional("org.eclipse.jetty:jetty-webapp:${jettyVersion}") { + exclude group: "javax.servlet", module: "javax.servlet" + } + optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") { + exclude group: "javax.servlet", module: "javax.servlet" + } + optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}") + optional("org.eclipse.jetty:jetty-client:${jettyVersion}") + optional("io.undertow:undertow-core:${undertowVersion}") + optional("io.undertow:undertow-servlet:${undertowVersion}") { + exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_3.1_spec" + exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec" + } + optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { + exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" + } + optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") + testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") + testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") + testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}") + testCompile("io.projectreactor:reactor-net:${reactorVersion}") + testCompile("io.netty:netty-all:${nettyVersion}") + testCompile("log4j:log4j:1.2.17") + testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") + } +} + project("spring-test") { description = "Spring TestContext Framework"