Skip to content

Commit 9ba6b66

Browse files
authored
Merge branch 'main' into blakeli0-patch-12
2 parents 37e0a8c + 67fe722 commit 9ba6b66

5 files changed

Lines changed: 11 additions & 16 deletions

File tree

grpc-gcp-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<jsr305.version>3.0.2</jsr305.version>
7474
<junit.version>4.13.2</junit.version>
7575
<opencensus.version>0.31.1</opencensus.version>
76-
<opentelemetry.version>1.57.0</opentelemetry.version>
76+
<opentelemetry.version>1.62.0</opentelemetry.version>
7777
<spanner.version>6.118.0-SNAPSHOT</spanner.version><!-- {x-version-update:google-cloud-spanner:current} -->
7878
<truth.version>1.4.5</truth.version>
7979
<mockito.version>4.11.0</mockito.version>

java-bigquery/samples/install-without-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<maven.compiler.target>1.8</maven.compiler.target>
3838
<maven.compiler.source>1.8</maven.compiler.source>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<opentelemetry.version>1.57.0</opentelemetry.version>
40+
<opentelemetry.version>1.62.0</opentelemetry.version>
4141
</properties>
4242

4343

java-spanner/benchmarks/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3535
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3636
<junixsocket.version>2.10.1</junixsocket.version>
37-
<opentelemetry.version>1.59.0</opentelemetry.version>
3837
<google.cloud.monitoring.version>3.85.0</google.cloud.monitoring.version>
3938
</properties>
4039

@@ -65,22 +64,18 @@
6564
<dependency>
6665
<groupId>io.opentelemetry</groupId>
6766
<artifactId>opentelemetry-sdk</artifactId>
68-
<version>${opentelemetry.version}</version>
6967
</dependency>
7068
<dependency>
7169
<groupId>io.opentelemetry</groupId>
7270
<artifactId>opentelemetry-sdk-metrics</artifactId>
73-
<version>${opentelemetry.version}</version>
7471
</dependency>
7572
<dependency>
7673
<groupId>io.opentelemetry</groupId>
7774
<artifactId>opentelemetry-sdk-trace</artifactId>
78-
<version>${opentelemetry.version}</version>
7975
</dependency>
8076
<dependency>
8177
<groupId>io.opentelemetry</groupId>
8278
<artifactId>opentelemetry-sdk-testing</artifactId>
83-
<version>${opentelemetry.version}</version>
8479
</dependency>
8580
<dependency>
8681
<groupId>com.google.re2j</groupId>

sdk-platform-java/dependencies.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
1111
javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2
1212
io.grpc:grpc-bom,grpc=1.81.0
13-
com.google.auth:google-auth-library-bom,google.auth=1.46.0
13+
com.google.auth:google-auth-library-bom,google.auth=1.47.0
1414
com.google.http-client:google-http-client,google.http-client=2.1.0
1515
com.google.code.gson:gson,gson=2.14.0
1616
com.google.guava:guava,guava=33.6.0-jre
17-
com.google.protobuf:protobuf-java,protobuf=4.34.1
18-
io.opentelemetry:opentelemetry-bom,opentelemetry=1.61.0
17+
com.google.protobuf:protobuf-java,protobuf=4.35.0
18+
io.opentelemetry:opentelemetry-bom,opentelemetry=1.62.0
1919
com.google.errorprone:error_prone_annotations,errorprone=2.49.0
2020
com.google.j2objc:j2objc-annotations,j2objc-annotations=3.1
21-
org.threeten:threetenbp,threetenbp=1.7.2
22-
org.slf4j:slf4j-api,slf4j=2.0.17
21+
org.threeten:threetenbp,threetenbp=1.7.3
22+
org.slf4j:slf4j-api,slf4j=2.0.18
2323

2424
# 1P Shared-Deps
2525
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml
@@ -32,7 +32,7 @@ com.google.api-client:google-api-client,google.api-client=2.9.0
3232
org.threeten:threeten-extra,threeten-extra=1.8.0
3333
io.opencensus:opencensus-api,opencensus=0.31.1
3434
com.google.code.findbugs:jsr305,findbugs=3.0.2
35-
com.fasterxml.jackson:jackson-bom,jackson=2.21.3
35+
com.fasterxml.jackson:jackson-bom,jackson=2.21.4
3636
commons-codec:commons-codec,codec=1.22.0
3737
org.apache.httpcomponents:httpclient,httpcomponents.httpclient=4.5.14
3838
org.apache.httpcomponents:httpcore,httpcomponents.httpcore=4.4.16
@@ -44,8 +44,8 @@ io.perfmark:perfmark-api,perfmark-api=0.27.0
4444
com.google.cloud.opentelemetry:exporter-metrics,google.cloud.opentelemetry=0.36.0
4545
com.google.flogger:flogger,flogger=0.9
4646
org.apache.arrow:arrow-memory-core,arrow=18.3.0
47-
dev.cel:cel,dev.cel=0.12.0
47+
dev.cel:cel,dev.cel=0.13.0
4848
com.google.crypto.tink:tink,com.google.crypto.tink=1.21.0
4949
# The follow opentelemetry dependencies have a different version from the opentelemetry-bom
50-
io.opentelemetry.semconv:opentelemetry-semconv,opentelemetry-semconv=1.41.0
50+
io.opentelemetry.semconv:opentelemetry-semconv,opentelemetry-semconv=1.41.1
5151
io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.52.0-alpha

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<gson.version>2.13.2</gson.version>
3232
<guava.version>33.5.0-jre</guava.version>
3333
<protobuf.version>4.33.2</protobuf.version>
34-
<opentelemetry.version>1.57.0</opentelemetry.version>
34+
<opentelemetry.version>1.62.0</opentelemetry.version>
3535
<errorprone.version>2.48.0</errorprone.version>
3636
<j2objc-annotations.version>3.1</j2objc-annotations.version>
3737
<threetenbp.version>1.7.0</threetenbp.version>

0 commit comments

Comments
 (0)