From 527499b624e743583fe0f93ea0b487031891ac3a Mon Sep 17 00:00:00 2001
From: Herman van Hovell <hvanhovell@questtec.nl>
Date: Wed, 25 May 2016 15:35:38 -0700
Subject: [PATCH] [SPARK-15525][SQL][BUILD] Upgrade ANTLR4 SBT plugin
## What changes were proposed in this pull request?
The ANTLR4 SBT plugin has been moved from its own repo to one on bintray. The version was also changed from `0.7.10` to `0.7.11`. The latter actually broke our build (ihji has fixed this by also adding `0.7.10` and others to the bin-tray repo).
This PR upgrades the SBT-ANTLR4 plugin and ANTLR4 to their most recent versions (`0.7.11`/`4.5.3`). I have also removed a few obsolete build configurations.
## How was this patch tested?
Manually running SBT/Maven builds.
Author: Herman van Hovell <hvanhovell@questtec.nl>
Closes #13299 from hvanhovell/SPARK-15525.
---
dev/deps/spark-deps-hadoop-2.2 | 2 +-
dev/deps/spark-deps-hadoop-2.3 | 2 +-
dev/deps/spark-deps-hadoop-2.4 | 2 +-
dev/deps/spark-deps-hadoop-2.6 | 2 +-
dev/deps/spark-deps-hadoop-2.7 | 2 +-
pom.xml | 7 +------
project/plugins.sbt | 5 +----
7 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 0ac1c00154..0d6b18e8b7 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -3,7 +3,7 @@ RoaringBitmap-0.5.11.jar
ST4-4.0.4.jar
antlr-2.7.7.jar
antlr-runtime-3.4.jar
-antlr4-runtime-4.5.2-1.jar
+antlr4-runtime-4.5.3.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.4.0-b34.jar
apache-log4j-extras-1.2.17.jar
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index fa35fa7051..a3597f4ec7 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -4,7 +4,7 @@ ST4-4.0.4.jar
activation-1.1.1.jar
antlr-2.7.7.jar
antlr-runtime-3.4.jar
-antlr4-runtime-4.5.2-1.jar
+antlr4-runtime-4.5.3.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.4.0-b34.jar
apache-log4j-extras-1.2.17.jar
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 99dffa93bb..3ca44c5abc 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -4,7 +4,7 @@ ST4-4.0.4.jar
activation-1.1.1.jar
antlr-2.7.7.jar
antlr-runtime-3.4.jar
-antlr4-runtime-4.5.2-1.jar
+antlr4-runtime-4.5.3.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.4.0-b34.jar
apache-log4j-extras-1.2.17.jar
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index a3bee36ce5..01e7551708 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -4,7 +4,7 @@ ST4-4.0.4.jar
activation-1.1.1.jar
antlr-2.7.7.jar
antlr-runtime-3.4.jar
-antlr4-runtime-4.5.2-1.jar
+antlr4-runtime-4.5.3.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.4.0-b34.jar
apache-log4j-extras-1.2.17.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index dbd7a8e0bf..402fd05376 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -4,7 +4,7 @@ ST4-4.0.4.jar
activation-1.1.1.jar
antlr-2.7.7.jar
antlr-runtime-3.4.jar
-antlr4-runtime-4.5.2-1.jar
+antlr4-runtime-4.5.3.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.4.0-b34.jar
apache-log4j-extras-1.2.17.jar
diff --git a/pom.xml b/pom.xml
index f28aa14adc..3fa0eeb5f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
<jodd.version>3.5.2</jodd.version>
<jsr305.version>1.3.9</jsr305.version>
<libthrift.version>0.9.2</libthrift.version>
- <antlr4.version>4.5.2-1</antlr4.version>
+ <antlr4.version>4.5.3</antlr4.version>
<jpam.version>1.1</jpam.version>
<selenium.version>2.52.0</selenium.version>
<paranamer.version>2.8</paranamer.version>
@@ -1952,11 +1952,6 @@
</compilerArgs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>3.5.2</version>
- </plugin>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 44ec3a12ae..4578b56247 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -20,7 +20,4 @@ libraryDependencies += "org.ow2.asm" % "asm" % "5.0.3"
libraryDependencies += "org.ow2.asm" % "asm-commons" % "5.0.3"
-// TODO I am not sure we want such a dep.
-resolvers += "simplytyped" at "http://simplytyped.github.io/repo/releases"
-
-addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.10")
+addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.11")
--
GitLab