Skip to content

Commit 447090b

Browse files
authored
chore: Update guava in tests to v33.5.0 (#7261)
* chore: Update guava in tests to v33.5.0 * chore: Upgrade guava and errorprone * chore: Move maven version to a property * chore: Move errorprone to a profile * chore: Try to keep the parent * chore: Use java 8 * chore: Remove unneeded configs * chore: Remove guava property * Revert "chore: Remove guava property" This reverts commit 84a9d9c.
1 parent 0d04af6 commit 447090b

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

dashboard/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,27 @@
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3131
<maven.compiler.source>1.8</maven.compiler.source>
3232
<maven.compiler.target>1.8</maven.compiler.target>
33+
34+
<guava.version>33.5.0-jre</guava.version>
3335
</properties>
3436

37+
<dependencyManagement>
38+
<dependencies>
39+
<dependency>
40+
<groupId>com.google.guava</groupId>
41+
<artifactId>guava-bom</artifactId>
42+
<version>${guava.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
46+
</dependencies>
47+
</dependencyManagement>
48+
3549
<dependencies>
50+
<dependency>
51+
<groupId>com.google.guava</groupId>
52+
<artifactId>guava</artifactId>
53+
</dependency>
3654
<dependency>
3755
<groupId>org.freemarker</groupId>
3856
<artifactId>freemarker</artifactId>

tests/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,25 @@
2929
<url>https://raw.githubusercontent.com/googleapis/google-cloud-java/master/LICENSE</url>
3030
</license>
3131
</licenses>
32+
33+
<dependencyManagement>
34+
<dependencies>
35+
<dependency>
36+
<groupId>com.google.guava</groupId>
37+
<artifactId>guava-bom</artifactId>
38+
<version>33.5.0-jre</version>
39+
<type>pom</type>
40+
<scope>import</scope>
41+
</dependency>
42+
</dependencies>
43+
</dependencyManagement>
44+
3245
<!-- adding comment for testing-->
3346
<dependencies>
47+
<dependency>
48+
<groupId>com.google.guava</groupId>
49+
<artifactId>guava</artifactId>
50+
</dependency>
3451
<dependency>
3552
<groupId>com.google.cloud.tools</groupId>
3653
<artifactId>dependencies</artifactId>

0 commit comments

Comments
 (0)