From 2d7c0c2f006244c5196d3ff24cfa11a421bf8b48 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 14 Apr 2015 09:49:08 +0100
Subject: [PATCH] Provide dependency management for Antlr 2

Hibernate depends on antlr:antlr:2.7.7 (the latest version on Antlr 2)
and fails with earlier 2.7.x versions due to a missing method. This
can cause problems for Maven users if they also depend on something that
pulls in an earlier version of Antlr, such as
spring-boot-starter-velocity. Gradle users are unaffected as, when
multiple versions of a dependency are found in the graph, Gradle will
choose the latest version.

This commit adds dependency management for antlr:antlr:2.7.7 to ensure
that the latest, and Hibernate compatible, version of Antlr 2 is used.

Closes gh-2814
---
 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 d40c3d543fe..a2aee1b2c2d 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -47,6 +47,7 @@
 		<spring-boot.version>1.2.4.BUILD-SNAPSHOT</spring-boot.version>
 		<!-- Third Party -->
 		<activemq.version>5.10.1</activemq.version>
+		<antlr2.version>2.7.7</antlr2.version>
 		<aspectj.version>1.8.5</aspectj.version>
 		<atomikos.version>3.9.3</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>
@@ -410,6 +411,11 @@
 			</dependency>
 
 			<!-- Third Party -->
+			<dependency>
+				<groupId>antlr</groupId>
+				<artifactId>antlr</artifactId>
+				<version>${antlr2.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-classic</artifactId>