From bee973ae84700601ef6496f82b48be29001aebf8 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Thu, 12 Jul 2018 06:55:58 -0700
Subject: [PATCH] Move all dependency versions into the parent POM's
 dependencyManagement, thereby bumping Guava to 25.1 in the POMs I'd missed
 before.

I also:
- upgraded to the newest versions of our dependencies, using:
  mvn versions:use-latest-versions -Dexcludes=org.checkerframework,com.google.gwt,com.google.auto.value,com.google.guava
  mvn versions:display-dependency-updates # for manual review of dependencies whose versions are set in properties
- switched to the currently recommended way of depending on AutoValue (possibly outright necessary after the upgrades, but a good idea anyway)
- stopping marking annotations dependencies as <optional>, following our precedent in Guava (https://github.com/google/guava/issues/2721) and even a little already in Truth (CL 198881917)

The switch to dependencyManagement also incidentally bumps some jsr305 and Checker Framework versions for some POMs, but that's much less likely to matter.

Fixes https://github.com/google/truth/issues/473

RELNOTES=Made various dependency fixes and upgrades, including fixing https://github.com/google/truth/issues/473. Note that some annotations-only dependencies are now no longer `<provided>`. See https://github.com/google/guava/issues/2721 for details, but in short, feel free to exclude them if that works for your setup.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=204292747
---
 core/pom.xml                 | 27 ++---------
 extensions/java8/pom.xml     |  5 ---
 extensions/liteproto/pom.xml | 17 ++-----
 extensions/proto/pom.xml     | 17 ++-----
 extensions/re2j/pom.xml      |  4 --
 pom.xml                      | 86 ++++++++++++++++++++++++++++++++++++
 6 files changed, 98 insertions(+), 58 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7b382a1fd..274744a8d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,79 +9,61 @@
   </parent>
   <artifactId>truth</artifactId>
   <name>Truth Core</name>
-  <properties>
-    <guava.version>25.1-android</guava.version>
-    <guava-gwt.version>25.1-jre</guava-gwt.version>
-    <gwt.version>2.8.2</gwt.version>
-    <junit.version>4.12</junit.version>
-    <diffutils.version>1.3.0</diffutils.version>
-    <checker-framework.version>2.5.2</checker-framework.version>
-    <auto-value.version>1.5.3</auto-value.version>
-    <compile-testing.version>0.15</compile-testing.version>
-    <error-prone.annotations.version>2.2.0</error-prone.annotations.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-compat-qual</artifactId>
-      <version>${checker-framework.version}</version>
     </dependency>
     <!-- Manually add a dependency that guava-gwt needs but doesn't declare as of May 2018. -->
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>${checker-framework.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.java-diff-utils</groupId>
       <artifactId>diffutils</artifactId>
-      <version>${diffutils.version}</version>
     </dependency>
     <!-- Required only to build the -gwt sub-artifact. -->
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value-annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>${auto-value.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-gwt</artifactId>
-      <version>${guava-gwt.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>${guava.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.testing.compile</groupId>
       <artifactId>compile-testing</artifactId>
-      <version>${compile-testing.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>${error-prone.annotations.version}</version>
     </dependency>
   </dependencies>
   <build>
@@ -164,7 +146,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
         <executions>
           <execution>
             <id>gwt-test</id>
diff --git a/extensions/java8/pom.xml b/extensions/java8/pom.xml
index da744e6ed..b8f85432e 100644
--- a/extensions/java8/pom.xml
+++ b/extensions/java8/pom.xml
@@ -14,9 +14,6 @@
   <description>
     An extension for the Truth test assertion framework supporting Java8 types and structures
   </description>
-  <properties>
-    <checker-framework.version>2.0.0</checker-framework.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>com.google.truth</groupId>
@@ -26,8 +23,6 @@
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-compat-qual</artifactId>
-      <version>${checker-framework.version}</version>
-      <optional>true</optional>
     </dependency>
   </dependencies>
   <build>
diff --git a/extensions/liteproto/pom.xml b/extensions/liteproto/pom.xml
index bfe36ee4b..c6624b3dc 100644
--- a/extensions/liteproto/pom.xml
+++ b/extensions/liteproto/pom.xml
@@ -20,13 +20,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- TODO(cgruber): Add protoc dependencies to support tests. -->
     <maven.test.skip>true</maven.test.skip>
-
-    <!-- dependency versions -->
-    <auto-value.version>1.5.3</auto-value.version>
-    <error_prone_annotations.version>2.2.0</error_prone_annotations.version>
-    <checker-framework.version>2.0.0</checker-framework.version>
-    <guava.version>23.6-android</guava.version>
-    <protobuf.version>3.3.1</protobuf.version>
   </properties>
   <dependencies>
     <dependency>
@@ -37,30 +30,28 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-compat-qual</artifactId>
-      <version>${checker-framework.version}</version>
-      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>${auto-value.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>${error_prone_annotations.version}</version>
     </dependency>
     <!-- TODO(dploch): Depend on protobuf-lite when available. -->
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/extensions/proto/pom.xml b/extensions/proto/pom.xml
index 9e6057559..1ca36495e 100644
--- a/extensions/proto/pom.xml
+++ b/extensions/proto/pom.xml
@@ -20,13 +20,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- TODO(cgruber): Add protoc dependencies to support tests. -->
     <maven.test.skip>true</maven.test.skip>
-
-    <!-- dependency versions -->
-    <auto-value.version>1.5.3</auto-value.version>
-    <error_prone_annotations.version>2.2.0</error_prone_annotations.version>
-    <checker-framework.version>2.0.0</checker-framework.version>
-    <guava.version>23.6-android</guava.version>
-    <protobuf.version>3.3.1</protobuf.version>
   </properties>
   <dependencies>
     <dependency>
@@ -42,29 +35,27 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-compat-qual</artifactId>
-      <version>${checker-framework.version}</version>
-      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>${auto-value.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>${error_prone_annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/extensions/re2j/pom.xml b/extensions/re2j/pom.xml
index 0294a4dae..4bc0687fc 100644
--- a/extensions/re2j/pom.xml
+++ b/extensions/re2j/pom.xml
@@ -14,9 +14,6 @@
   <description>
     An extension for the Truth test assertion framework supporting RE2J patterns
   </description>
-  <properties>
-    <re2j.version>1.1</re2j.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>com.google.truth</groupId>
@@ -26,7 +23,6 @@
     <dependency>
       <groupId>com.google.re2j</groupId>
       <artifactId>re2j</artifactId>
-      <version>${re2j.version}</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/pom.xml b/pom.xml
index d20c667df..5502eb460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,88 @@
   <name>Truth (Parent)</name>
   <properties>
     <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
+
+    <!-- Properties for multiple-artifact deps. -->
+    <auto-value.version>1.6.2</auto-value.version>
+    <checker-framework.version>2.5.3</checker-framework.version>
+    <guava.version>25.1</guava.version>
+    <gwt.version>2.8.2</gwt.version>
   </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- I tried also including Truth's own submodules here, with version set to ${project.version} (as we have it in the individual POMs), but Maven doesn't like that, at least when run under TAP (which probably means "with an empty local repository" and/or "with no access to remote repositories"). So we have to specify project.version wherever we use submodules. At least we'll never need to update it :) -->
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}-android</version>
+      </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-compat-qual</artifactId>
+        <version>${checker-framework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-qual</artifactId>
+        <version>${checker-framework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+      </dependency>
+      <dependency>
+        <groupId>com.googlecode.java-diff-utils</groupId>
+        <artifactId>diffutils</artifactId>
+        <version>1.3.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.gwt</groupId>
+        <artifactId>gwt-user</artifactId>
+        <version>${gwt.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auto.value</groupId>
+        <artifactId>auto-value-annotations</artifactId>
+        <version>${auto-value.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auto.value</groupId>
+        <artifactId>auto-value</artifactId>
+        <version>${auto-value.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-gwt</artifactId>
+        <version>${guava.version}-jre</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib</artifactId>
+        <version>${guava.version}-android</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.testing.compile</groupId>
+        <artifactId>compile-testing</artifactId>
+        <version>0.15</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotations</artifactId>
+        <version>2.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>3.6.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.re2j</groupId>
+        <artifactId>re2j</artifactId>
+        <version>1.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <description>
     Parent metdata for Truth, a Java assertion framework.
   </description>
@@ -163,6 +244,11 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.12.4</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>gwt-maven-plugin</artifactId>
+          <version>${gwt.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <!--