From 2acecd0ee0b57102b6dd690b1f868843a6681dfe Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 2 May 2016 10:39:10 -0700
Subject: Upgrade to Scala 2.12-compatible json4s.

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52da625eac..60b537baa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
     <jsr305.version>1.3.9</jsr305.version>
     <libthrift.version>0.9.2</libthrift.version>
     <antlr4.version>4.5.2-1</antlr4.version>
-    <json4s.version>3.2.2</json4s.version>
+    <json4s.version>3.3.0</json4s.version>
 
     <test.java.home>${java.home}</test.java.home>
     <test.exclude.tags></test.exclude.tags>
@@ -2539,8 +2539,6 @@
         <!-- This incorporates https://github.com/FasterXML/jackson-module-scala/pull/247 -->
         <fasterxml.jackson.scala.version>2.7.3-SNAPSHOT</fasterxml.jackson.scala.version>
         <fasterxml.jackson.version>2.7.0</fasterxml.jackson.version>
-        <!-- This corresponds to https://github.com/JoshRosen/json4s/tree/scala-2.12.0-m4 -->
-        <json4s.version>3.4.0-SNAPSHOT</json4s.version>
       </properties>
       <repositories>
         <repository>
-- 
cgit v1.2.3