upgrade version and finagle version

Author: daviddenton

CHANGELOG.md

@@ -7,6 +7,8 @@ The main API is stable, but expect some amount of breaking changes around major
 - Add strict `Accept` header checking for `RouteSpec`s based on `producing()` settings. Option for non-strictness.
 - Add integrated self-hosted Swagger UI/ReDoc UI module
 
+## 14.21.0
+- Upgrade Finagle to new version
 
 ## 14.20.0
 - Upgrade Finagle to new version (with new versioning scheme)

build.sbt

@@ -33,16 +33,17 @@ lazy val baseSettings = Seq(
   credentials += Credentials(Path.userHome / ".sonatype" / ".credentials")
 )
 
-val finagleVersion = "17.10.0"
-val json4sVersion = "3.5.2"
-val circeVersion = "0.8.0"
+val finagleVersion = "18.1.0"
+val json4sVersion = "3.5.3"
+val circeVersion = "0.9.1"
 
 lazy val core = project
   .settings(baseSettings)
   .settings(moduleName := "fintrospect-core")
   .settings(libraryDependencies ++= Seq(
     "net.sourceforge.argo" % "argo" % "3.40",
     "com.twitter" %% "finagle-http" % finagleVersion,
+    "com.google.guava" % "guava" % "23.0",
     "org.scala-lang.modules" %% "scala-xml" % "1.0.6",
     "org.scalatest" %% "scalatest" % "3.0.0" % "test"
   ))
@@ -53,7 +54,7 @@ lazy val argonaut = project
   .settings(moduleName := "fintrospect-argonaut")
   .settings(description := "Argonaut JSON library support for Fintrospect")
   .dependsOn(core % "compile->test")
-  .settings(libraryDependencies += "io.argonaut" %% "argonaut" % "6.2-RC2")
+  .settings(libraryDependencies += "io.argonaut" %% "argonaut" % "6.2.1")
 
 lazy val circe = project
   .settings(baseSettings)
@@ -99,7 +100,7 @@ lazy val spray = project
   .settings(moduleName := "fintrospect-spray")
   .settings(description := "Spray JSON library support for Fintrospect")
   .dependsOn(core % "compile->test")
-  .settings(libraryDependencies += "io.spray" %% "spray-json" % "1.3.3")
+  .settings(libraryDependencies += "io.spray" %% "spray-json" % "1.3.4")
 
 lazy val msgpack = project
   .settings(baseSettings)
@@ -131,4 +132,4 @@ lazy val examples = project.in(file("."))
   .settings(moduleName := "fintrospect-examples")
   .aggregate(core, argonaut, circe, gson, jackson, json4s, play, spray, msgpack, handlebars, mustache)
   .dependsOn(core, argonaut, circe, gson, jackson, json4s, play, spray, msgpack, handlebars, mustache)
-  .settings(libraryDependencies += "com.github.finagle" %% "finagle-oauth2" % "0.6.45")
+  .settings(libraryDependencies += "com.github.finagle" %% "finagle-oauth2" % "17.12.0")

core/src/main/scala/io/fintrospect/filters/RequestFilters.scala

@@ -3,7 +3,6 @@ package io.fintrospect.filters
 import java.nio.charset.StandardCharsets.ISO_8859_1
 import java.util.Base64
 
-import com.google.common.net.HttpHeaders
 import com.twitter.finagle.Filter
 import com.twitter.finagle.http.{Request, Response, Status}
 import com.twitter.util.Future
@@ -14,6 +13,7 @@ import io.fintrospect.renderers.ModuleRenderer
 import io.fintrospect.renderers.simplejson.SimpleJson
 import io.fintrospect.util.{Extracted, Extraction, ExtractionFailed, Extractor}
 import io.fintrospect.{ContentType, ContentTypes}
+import io.netty.handler.codec.http.HttpHeaderNames
 import org.jboss.netty.handler.codec.http.HttpHeaders.Names.{ACCEPT, AUTHORIZATION, HOST}
 
 /**
@@ -71,7 +71,7 @@ object RequestFilters {
     */
   def AddUserAgent[T](user: String): Filter[Request, T, Request, T] = Filter.mk[Request, T, Request, T] {
     (req, svc) => {
-      req.headerMap(HttpHeaders.USER_AGENT) = user
+      req.headerMap(HttpHeaderNames.USER_AGENT.toString) = user
       svc(req)
     }
   }
@@ -109,3 +109,8 @@ object RequestFilters {
     }
   }
 }
+
+
+object A extends App {
+  println(HttpHeaderNames.USER_AGENT.toString)
+}

core/src/main/scala/io/fintrospect/formats/ResponseBuilder.scala

@@ -3,7 +3,6 @@ package io.fintrospect.formats
 import java.io.OutputStream
 import java.nio.charset.StandardCharsets.UTF_8
 
-import com.google.common.net.HttpHeaders
 import com.twitter.concurrent.AsyncStream
 import com.twitter.finagle.http.{Cookie, Response, Status}
 import com.twitter.io.Buf.Utf8