From 8ea0d8eea1578923a4fa9ee2c8eab60a83501510 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 26 Jun 2014 12:21:21 +0200
Subject: [PATCH] Latest dependency updates (AspectJ 1.8.1, Reactor 1.1.2,
 Tomcat 8.0.9, Jackson 2.4.1, JAMon 2.76)

---
 build.gradle                                      | 12 ++++++------
 .../web/socket/TomcatWebSocketTestServer.java     | 15 +++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 14c58a4df14..53e80a51683 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.aspectjVersion       = "1.8.0"
+	ext.aspectjVersion       = "1.8.1"
 	ext.eclipseLinkVersion   = "2.4.2"
 	ext.groovyVersion        = "2.3.3"
 	ext.hibernate3Version    = "3.6.10.Final"
@@ -21,7 +21,7 @@ configure(allprojects) { project ->
 	ext.hibVal4Version       = "4.3.1.Final"
 	ext.hibVal5Version       = "5.1.1.Final"
 	ext.hsqldbVersion        = "2.3.2"
-	ext.jackson2Version      = "2.4.0"
+	ext.jackson2Version      = "2.4.1"
 	ext.gsonVersion          = "2.2.4"
 	ext.jasperReportsVersion = "5.6.0"
 	ext.jettyVersion         = "9.2.1.v20140609"
@@ -33,7 +33,7 @@ configure(allprojects) { project ->
 	ext.snifferVersion       = "1.11"
 	ext.tiles2Version        = "2.2.2"
 	ext.tiles3Version        = "3.0.4"
-	ext.tomcatVersion        = "8.0.8"
+	ext.tomcatVersion        = "8.0.9"
 	ext.xstreamVersion       = "1.4.7"
 
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
@@ -369,7 +369,7 @@ project("spring-aop") {
 		compile("aopalliance:aopalliance:1.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("commons-pool:commons-pool:1.6")
-		optional("com.jamonapi:jamon:2.4")
+		optional("com.jamonapi:jamon:2.76")
 	}
 }
 
@@ -683,8 +683,8 @@ project("spring-websocket") {
 		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("org.projectreactor:reactor-core:1.1.0.RELEASE")
-		testCompile("org.projectreactor:reactor-net:1.1.0.RELEASE")
+		testCompile("org.projectreactor:reactor-core:1.1.2.RELEASE")
+		testCompile("org.projectreactor:reactor-net:1.1.2.RELEASE")
 		testCompile("log4j:log4j:1.2.17")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
index caff98f6873..4c49908374a 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,22 +19,21 @@ package org.springframework.web.socket;
 import java.io.File;
 import java.io.IOException;
 import java.util.EnumSet;
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.coyote.http11.Http11NioProtocol;
-import org.apache.tomcat.util.descriptor.web.ApplicationListener;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.apache.tomcat.websocket.server.WsContextListener;
+
 import org.springframework.util.SocketUtils;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-
 /**
  * Tomcat based {@link WebSocketTestServer}.
  *
@@ -42,9 +41,6 @@ import javax.servlet.Filter;
  */
 public class TomcatWebSocketTestServer implements WebSocketTestServer {
 
-	private static final ApplicationListener WS_APPLICATION_LISTENER =
-			new ApplicationListener(WsContextListener.class.getName(), false);
-
 	private final Tomcat tomcatServer;
 
 	private final int port;
@@ -53,7 +49,6 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
 
 
 	public TomcatWebSocketTestServer() {
-
 		this.port = SocketUtils.findAvailableTcpPort();
 
 		Connector connector = new Connector(Http11NioProtocol.class.getName());
@@ -90,7 +85,7 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
 	@Override
 	public void deployConfig(WebApplicationContext wac, Filter... filters) {
         this.context = this.tomcatServer.addContext("", System.getProperty("java.io.tmpdir"));
-        this.context.addApplicationListener(WS_APPLICATION_LISTENER);
+        this.context.addApplicationListener(WsContextListener.class.getName());
 		Tomcat.addServlet(this.context, "dispatcherServlet", new DispatcherServlet(wac)).setAsyncSupported(true);
 		this.context.addServletMapping("/", "dispatcherServlet");
 		for (Filter filter : filters) {