Skip to content

Commit

Permalink
Update to auto-parent 7 to get the latest version of Guava
Browse files Browse the repository at this point in the history
Along the way, also clean up some explicit versions that are set in auto-parent

Fixes #683

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=223540267
  • Loading branch information
ronshapiro committed Dec 3, 2018
1 parent 2a5d885 commit cdd39ee
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 16 deletions.
11 changes: 7 additions & 4 deletions factory/src/it/functional/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion service/processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion value/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions value/src/it/functional/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions value/src/it/gwtserializer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit cdd39ee

Please sign in to comment.