Skip to content

Commit f717792

Browse files
authored
Merge branch 'main' into renovate/google-auth-library-dependencies
2 parents 24ea4ba + 661eba1 commit f717792

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

dependencies.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
88
javax.annotation-api=1.3.2
99
grpc=1.75.0
10-
google.auth=1.38.0
10+
google.auth=1.39.0
1111
google.http-client=2.0.0
12-
gson=2.13.1
12+
gson=2.13.2
1313
guava=33.4.8-jre
14-
protobuf=4.32.0
14+
protobuf=4.32.1
1515
# Note: This opentelemetry version refers to the opentelemetry-bom
16-
opentelemetry=1.53.0
16+
opentelemetry=1.54.0
1717
errorprone=2.41.0
1818
j2objc-annotations=3.1
1919
threetenbp=1.7.2
@@ -45,4 +45,4 @@ dev.cel=0.11.0
4545
com.google.crypto.tink=1.18.0
4646
# The follow opentelemetry dependencies have a different version from the opentelemetry-bom
4747
opentelemetry-semconv=1.37.0
48-
io.opentelemetry.contrib.opentelemetry-gcp-resources=1.48.0-alpha
48+
io.opentelemetry.contrib.opentelemetry-gcp-resources=1.49.0-alpha

generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
googleapis_commitish: 6288882e44b2659de26e5038950987b3b0aceb57
1+
googleapis_commitish: 9f0cd3d817cac49dce85e353be70fd8dea1f8889
22
# the libraries are ordered with respect to library name, which is
33
# java-{library.library_name} or java-{library.api-shortname} when
44
# library.library_name is not defined.

java-common-protos/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444
<github.global.server>github</github.global.server>
4545
<site.installationModule>google-iam-parent</site.installationModule>
46-
<junit.version>4.13.2</junit.version>
4746
</properties>
4847

4948
<dependencyManagement>

0 commit comments

Comments
 (0)