From 42f363dc1209c7e4107cb9e75f59c8300c16fdda Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Wed, 26 Feb 2014 14:01:46 +0000
Subject: [PATCH] Explicitly manager javassist version

Hibernate is picky about javassist, but unfortunately that
library is used by other parts of our stack (Thymeleaf!?), so
we need a policy for resolving the dependency transitively.
I fixed it to the version in Hibernate 4.3.1 (our current
best foot forward), but it will have to be updateed whenever
Hibernate is.

Fixes gh-402
---
 spring-boot-dependencies/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index dc9de80786..5fb3ca92df 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -25,6 +25,7 @@
 		<httpasyncclient.version>4.0.1</httpasyncclient.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
 		<jackson.version>2.3.1</jackson.version>
+		<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
 		<jetty.version>8.1.14.v20131031</jetty.version>
 		<joda-time.version>2.3</joda-time.version>
 		<jolokia.version>1.2.0</jolokia.version>
@@ -287,6 +288,11 @@
 				<artifactId>hsqldb</artifactId>
 				<version>${hsqldb.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.javassist</groupId>
+				<artifactId>javassist</artifactId>
+				<version>${javassist.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.liquibase</groupId>
 				<artifactId>liquibase-core</artifactId>