From cdd39ee565c8d73fcac08474956dae79caa3df81 Mon Sep 17 00:00:00 2001
From: ronshapiro <ronshapiro@google.com>
Date: Fri, 30 Nov 2018 10:50:15 -0800
Subject: [PATCH] Update to auto-parent 7 to get the latest version of Guava

Along the way, also clean up some explicit versions that are set in auto-parent

Fixes https://github.com/google/auto/issues/683

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=223540267
---
 factory/src/it/functional/pom.xml  | 11 +++++++----
 service/annotations/pom.xml        |  2 +-
 service/pom.xml                    |  2 +-
 service/processor/pom.xml          |  2 +-
 value/pom.xml                      |  2 +-
 value/src/it/functional/pom.xml    |  5 -----
 value/src/it/gwtserializer/pom.xml |  3 ---
 7 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/factory/src/it/functional/pom.xml b/factory/src/it/functional/pom.xml
index 27864811e6..b8bb38d184 100644
--- a/factory/src/it/functional/pom.xml
+++ b/factory/src/it/functional/pom.xml
@@ -17,6 +17,13 @@
 <!-- TODO(gak): see if we can manage these dependencies any better -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>com.google.auto</groupId>
+    <artifactId>auto-parent</artifactId>
+    <version>7</version>
+  </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.auto.value.it.functional</groupId>
   <artifactId>functional</artifactId>
@@ -31,13 +38,11 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>23.4-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
@@ -58,13 +63,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.36</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/service/annotations/pom.xml b/service/annotations/pom.xml
index 7d9fc533ce..5cf91b3e31 100644
--- a/service/annotations/pom.xml
+++ b/service/annotations/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.auto</groupId>
     <artifactId>auto-parent</artifactId>
-    <version>6</version>
+    <version>7</version>
   </parent>
 
   <groupId>com.google.auto.service</groupId>
diff --git a/service/pom.xml b/service/pom.xml
index 1415ca661f..63eabc4afe 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.auto</groupId>
     <artifactId>auto-parent</artifactId>
-    <version>6</version>
+    <version>7</version>
   </parent>
 
   <groupId>com.google.auto.service</groupId>
diff --git a/service/processor/pom.xml b/service/processor/pom.xml
index 341b20877f..029072eb56 100644
--- a/service/processor/pom.xml
+++ b/service/processor/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.auto</groupId>
     <artifactId>auto-parent</artifactId>
-    <version>6</version>
+    <version>7</version>
   </parent>
 
   <groupId>com.google.auto.service</groupId>
diff --git a/value/pom.xml b/value/pom.xml
index b78a11eba2..2688eb37e5 100644
--- a/value/pom.xml
+++ b/value/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.auto</groupId>
     <artifactId>auto-parent</artifactId>
-    <version>6</version>
+    <version>7</version>
   </parent>
 
   <groupId>com.google.auto.value</groupId>
diff --git a/value/src/it/functional/pom.xml b/value/src/it/functional/pom.xml
index c1a4bf9d6f..37cf060d72 100644
--- a/value/src/it/functional/pom.xml
+++ b/value/src/it/functional/pom.xml
@@ -51,12 +51,10 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>23.5-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -67,19 +65,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>23.5-jre</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.36</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/value/src/it/gwtserializer/pom.xml b/value/src/it/gwtserializer/pom.xml
index 15d53f273f..41f3fd0380 100644
--- a/value/src/it/gwtserializer/pom.xml
+++ b/value/src/it/gwtserializer/pom.xml
@@ -65,19 +65,16 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>23.5-jre</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-gwt</artifactId>
-      <version>23.5-jre</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>