Skip to content

Commit

Permalink
Move all dependency versions into the parent POM's dependencyManageme…
Browse files Browse the repository at this point in the history 
…nt, 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 (google/guava#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 #473

RELNOTES=Made various dependency fixes and upgrades, including fixing #473. Note that some annotations-only dependencies are now no longer `<provided>`. See google/guava#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
  • Loading branch information
@cpovirk
cpovirk committed Jul 12, 2018
1 parent 40c8bd1 commit bee973a
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 58 deletions.
27 changes: 4 additions & 23 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions extensions/java8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
17 changes: 4 additions & 13 deletions extensions/liteproto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
17 changes: 4 additions & 13 deletions extensions/proto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions extensions/re2j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -26,7 +23,6 @@
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
<version>${re2j.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
86 changes: 86 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
<!--
Expand Down

0 comments on commit bee973a

Please sign in to comment.