Skip to content

Commit 568c616

Browse files
Merge branch 'main' into jdbc/feature-branch-otel
2 parents b6d8f63 + be285d4 commit 568c616

291 files changed

Lines changed: 6782 additions & 776 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/java-vertexai/ @googleapis/vertexai-team @googleapis/cloud-sdk-java-team
1010
/java-bigquerystorage/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
1111
/java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
12+
/java-bigquery-jdbc/ @googleapis/bigquery-developer-tools-team @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
1213
/grpc-gcp-java/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1314
/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1415
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
@@ -18,3 +19,4 @@
1819
/java-pubsub/ @googleapis/pubsub-team @googleapis/cloud-sdk-java-team
1920
/java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team
2021
/java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team
22+
/librarian.yaml @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team

.github/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ charset-normalizer==3.3.2 \
100100
--hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
101101
--hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
102102
# via requests
103-
idna==3.7 \
104-
--hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
105-
--hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
103+
idna==3.15 \
104+
--hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \
105+
--hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc
106106
# via requests
107107
requests==2.33.0 \
108108
--hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ monorepo
8686
*.tfstate.lock.info
8787

8888
.jqwik-database
89+
90+
# Python build artifacts for library_generation tool
91+
sdk-platform-java/hermetic_build/library_generation/build/

java-aiplatform/google-cloud-aiplatform-bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.api.grpc</groupId>
3939
<artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
40-
<version>0.110.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
40+
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
4141
</dependency>
4242
<dependency>
4343
<groupId>com.google.api.grpc</groupId>
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>com.google.api.grpc</groupId>
4949
<artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
50-
<version>0.110.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
50+
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
5151
</dependency>
5252
</dependencies>
5353
</dependencyManagement>

java-aiplatform/grpc-google-cloud-aiplatform-v1beta1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
7-
<version>0.110.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
7+
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
88
<name>grpc-google-cloud-aiplatform-v1beta1</name>
99
<description>GRPC library for google-cloud-aiplatform</description>
1010
<parent>

java-aiplatform/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.api.grpc</groupId>
4141
<artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
42-
<version>0.110.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
42+
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
4343
</dependency>
4444
<dependency>
4545
<groupId>com.google.api.grpc</groupId>
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.api.grpc</groupId>
5151
<artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
52-
<version>0.110.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
52+
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
5353
</dependency>
5454
</dependencies>
5555
</dependencyManagement>

java-aiplatform/proto-google-cloud-aiplatform-v1beta1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
7-
<version>0.110.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
7+
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
88
<name>proto-google-cloud-aiplatform-v1beta1</name>
99
<description>Proto library for google-cloud-aiplatform</description>
1010
<parent>

java-artifact-registry/google-cloud-artifact-registry-bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.google.api.grpc</groupId>
3434
<artifactId>grpc-google-cloud-artifact-registry-v1beta2</artifactId>
35-
<version>0.98.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-artifact-registry-v1beta2:current} -->
35+
<version>1.92.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-artifact-registry-v1beta2:current} -->
3636
</dependency>
3737
<dependency>
3838
<groupId>com.google.api.grpc</groupId>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.api.grpc</groupId>
4444
<artifactId>proto-google-cloud-artifact-registry-v1beta2</artifactId>
45-
<version>0.98.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-artifact-registry-v1beta2:current} -->
45+
<version>1.92.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-artifact-registry-v1beta2:current} -->
4646
</dependency>
4747
<dependency>
4848
<groupId>com.google.api.grpc</groupId>

java-artifact-registry/grpc-google-cloud-artifact-registry-v1beta2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-artifact-registry-v1beta2</artifactId>
7-
<version>0.98.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-artifact-registry-v1beta2:current} -->
7+
<version>1.92.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-artifact-registry-v1beta2:current} -->
88
<name>grpc-google-cloud-artifact-registry-v1beta2</name>
99
<description>GRPC library for google-cloud-artifact-registry</description>
1010
<parent>

java-artifact-registry/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
<dependency>
4545
<groupId>com.google.api.grpc</groupId>
4646
<artifactId>proto-google-cloud-artifact-registry-v1beta2</artifactId>
47-
<version>0.98.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-artifact-registry-v1beta2:current} -->
47+
<version>1.92.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-artifact-registry-v1beta2:current} -->
4848
</dependency>
4949
<dependency>
5050
<groupId>com.google.api.grpc</groupId>
5151
<artifactId>grpc-google-cloud-artifact-registry-v1beta2</artifactId>
52-
<version>0.98.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-artifact-registry-v1beta2:current} -->
52+
<version>1.92.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-artifact-registry-v1beta2:current} -->
5353
</dependency>
5454
</dependencies>
5555
</dependencyManagement>

0 commit comments

Comments
 (0)