Skip to content

Commit

Permalink
[Dependency Update] com.google.guava:guava (#38656)
Browse files Browse the repository at this point in the history
* External Dependency Update:
com.google.guava:guava: 32.0.1-jre -> 33.0.0-jre

Add transient dependency on com.google.guava:guava until baseline is bumped to Java 11

* Adding comment to explain direct-dependency addition
  • Loading branch information
jairmyree authored Feb 8, 2024
1 parent 6cde3f8 commit 16b8ac3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
9 changes: 9 additions & 0 deletions eng/code-quality-reports/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
</scm>

<dependencies>

<!-- Transient Direct Dependency until bump to Java 11 baseline -->
<!-- Necessary because com.puppycrawl.tools:checkstyle:10+ requires Java 11 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.0.0-jre</version> <!-- {x-version-update;com.google.guava:guava;external_dependency} -->
</dependency>

<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ com.github.spotbugs:spotbugs;4.8.3
com.github.spotbugs:spotbugs-annotations;4.8.3
com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0
com.google.code.gson:gson;2.10
com.google.guava:guava;32.0.1-jre
com.google.guava:guava;33.0.0-jre
com.h2database:h2;2.2.220
com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0
com.microsoft.azure:applicationinsights-core;3.4.1
Expand Down Expand Up @@ -348,7 +348,7 @@ test_jar_com.microsoft.azure:azure-mgmt-resources;1.3.1-SNAPSHOT

# everything under sdk\cosmos
cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.13.5
cosmos_com.google.guava:guava;32.0.1-jre
cosmos_com.google.guava:guava;33.0.0-jre
cosmos_com.microsoft.data.encryption:cryptography;0.2.2.jre8-preview
cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.2.2.jre8-preview
cosmos_io.dropwizard.metrics:metrics-core;4.1.0
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/azure-cosmos-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version> <!-- {x-version-update;cosmos_com.google.guava:guava;external_dependency} -->
<version>33.0.0-jre</version> <!-- {x-version-update;cosmos_com.google.guava:guava;external_dependency} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -263,7 +263,7 @@ Licensed under the MIT License.
<include>org.slf4j:slf4j-api:[1.7.36]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->

<!-- The benchmarking tool is allowed additional dependencies as it is not a library -->
<include>com.google.guava:guava:[32.0.1-jre]</include> <!-- {x-include-update;cosmos_com.google.guava:guava;external_dependency} -->
<include>com.google.guava:guava:[33.0.0-jre]</include> <!-- {x-include-update;cosmos_com.google.guava:guava;external_dependency} -->
<include>io.dropwizard.metrics:metrics-graphite:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-graphite;external_dependency} -->
<include>io.dropwizard.metrics:metrics-jvm:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-jvm;external_dependency} -->
<include>io.micrometer:micrometer-registry-azure-monitor:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
Expand Down
4 changes: 2 additions & 2 deletions sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version> <!-- {x-version-update;com.google.guava:guava;external_dependency} -->
<version>33.0.0-jre</version> <!-- {x-version-update;com.google.guava:guava;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -198,7 +198,7 @@
<include>io.fabric8:kubernetes-client:[5.12.3]</include> <!-- {x-include-update;io.fabric8:kubernetes-client;external_dependency} -->
<include>com.jcraft:jsch:[0.1.55]</include> <!-- {x-include-update;resourcemanager_com.jcraft:jsch;external_dependency} -->
<include>org.slf4j:slf4j-simple:[1.7.36]</include> <!-- {x-include-update;org.slf4j:slf4j-simple;external_dependency} -->
<include>com.google.guava:guava:[32.0.1-jre]</include> <!-- {x-include-update;com.google.guava:guava;external_dependency} -->
<include>com.google.guava:guava:[33.0.0-jre]</include> <!-- {x-include-update;com.google.guava:guava;external_dependency} -->
<include>com.github.docker-java:docker-java:[3.2.1]</include> <!-- {x-include-update;com.github.docker-java:docker-java;external_dependency} -->
<include>com.microsoft.sqlserver:mssql-jdbc:[10.2.3.jre8]</include> <!-- {x-include-update;com.microsoft.sqlserver:mssql-jdbc;external_dependency} -->
<include>commons-net:commons-net:[3.9.0]</include> <!-- {x-include-update;commons-net:commons-net;external_dependency} -->
Expand Down

0 comments on commit 16b8ac3

Please sign in to comment.