Skip to content

Commit 49c446f

Browse files
committed
Merge branch 'main' into new-library/geminidataanalytics
2 parents 0e5848a + 67fe722 commit 49c446f

4 files changed

Lines changed: 3 additions & 8 deletions

File tree

  • grpc-gcp-java
  • java-bigquery/samples/install-without-bom
  • java-spanner/benchmarks
  • sdk-platform-java/gapic-generator-java-pom-parent

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/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)