From 36acd6a11a02d2fa08e51a333e8b863149c3c6f7 Mon Sep 17 00:00:00 2001
From: Matt Whisenhnunt <mwhisenhunt@google.com>
Date: Tue, 17 Oct 2017 13:52:10 -0700
Subject: [PATCH] Bump version of Guava and Jackson Core.

---
 google-http-client-appengine/pom.xml | 2 +-
 google-http-client-gson/pom.xml      | 2 +-
 google-http-client-jackson/pom.xml   | 2 +-
 google-http-client-jackson2/pom.xml  | 2 +-
 google-http-client-jdo/pom.xml       | 2 +-
 google-http-client-test/pom.xml      | 2 +-
 google-http-client-xml/pom.xml       | 2 +-
 google-http-client/pom.xml           | 4 ++--
 pom.xml                              | 8 ++++----
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml
index ea09e3cff..70fd3a1f9 100644
--- a/google-http-client-appengine/pom.xml
+++ b/google-http-client-appengine/pom.xml
@@ -80,7 +80,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml
index 722077fd4..e28daba09 100644
--- a/google-http-client-gson/pom.xml
+++ b/google-http-client-gson/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client-jackson/pom.xml b/google-http-client-jackson/pom.xml
index 43b60482f..c3c9393f7 100644
--- a/google-http-client-jackson/pom.xml
+++ b/google-http-client-jackson/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml
index 421353509..b0db5ea91 100644
--- a/google-http-client-jackson2/pom.xml
+++ b/google-http-client-jackson2/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client-jdo/pom.xml b/google-http-client-jdo/pom.xml
index ddcb55cee..008d820f3 100644
--- a/google-http-client-jdo/pom.xml
+++ b/google-http-client-jdo/pom.xml
@@ -110,7 +110,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml
index 78d5b3704..51464c03b 100644
--- a/google-http-client-test/pom.xml
+++ b/google-http-client-test/pom.xml
@@ -66,7 +66,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml
index 8a6e63ef8..7c51ac0cc 100644
--- a/google-http-client-xml/pom.xml
+++ b/google-http-client-xml/pom.xml
@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
index bd67e191f..094d5c3e7 100644
--- a/google-http-client/pom.xml
+++ b/google-http-client/pom.xml
@@ -115,12 +115,12 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-jdk5</artifactId>
+      <artifactId>guava</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib-jdk5</artifactId>
+      <artifactId>guava-testlib</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 599b446aa..922046e06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,12 +165,12 @@
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
-        <artifactId>guava-jdk5</artifactId>
+        <artifactId>guava</artifactId>
         <version>${project.guava.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
-        <artifactId>guava-testlib-jdk5</artifactId>
+        <artifactId>guava-testlib</artifactId>
         <version>${project.guava.version}</version>
       </dependency>
       <dependency>
@@ -612,9 +612,9 @@
     <project.jsr305.version>3.0.2</project.jsr305.version>
     <project.gson.version>2.1</project.gson.version>
     <project.jackson-core-asl.version>1.9.11</project.jackson-core-asl.version>
-    <project.jackson-core2.version>2.1.3</project.jackson-core2.version>
+    <project.jackson-core2.version>2.9.2</project.jackson-core2.version>
     <project.protobuf-java.version>2.6.1</project.protobuf-java.version>
-    <project.guava.version>17.0</project.guava.version>
+    <project.guava.version>19.0</project.guava.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
     <project.commons-logging.version>1.1.1</project.commons-logging.version>
     <project.httpclient.version>4.5.3</project.httpclient.version>