From a4f77ae275c9e068a428f0f813b2abc4f00d5a82 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 15 Apr 2016 11:49:13 +0100
Subject: [PATCH] Provide dependency management for com.fasterxml:classmate

Hibernate and Hibernate Validator depend on different versions of
Classmate (1.1 and 1.3 respectively). This can lead to build failures
when Maven's Enforcer plugin is used.

This commit adds dependency management for Classmate which ensures
that a consistent version is used and convergence errors are avoided.

Closes gh-5697
---
 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 b2c01dce5a..645df730d5 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -53,6 +53,7 @@
 		<bitronix.version>2.1.4</bitronix.version>
 		<caffeine.version>2.2.6</caffeine.version>
 		<cassandra-driver.version>2.1.9</cassandra-driver.version>
+		<classmate.version>1.3.1</classmate.version>
 		<commons-beanutils.version>1.9.2</commons-beanutils.version>
 		<commons-collections.version>3.2.2</commons-collections.version>
 		<commons-codec.version>1.10</commons-codec.version>
@@ -587,6 +588,11 @@
 				<artifactId>cassandra-driver-mapping</artifactId>
 				<version>${cassandra-driver.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.fasterxml</groupId>
+				<artifactId>classmate</artifactId>
+				<version>${classmate.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>