Skip to content

Commit f7fc8fc

Browse files
authored
Merge branch 'main' into feat/jspecify-generator-annotations
2 parents d338eb1 + 8d687dc commit f7fc8fc

3,729 files changed

Lines changed: 890236 additions & 76850 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/workflows/create_additional_release_tag.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
env:
3030
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
3131
run: |
32-
ARTIFACT_IDS=('google-cloud-shared-dependencies' 'api-common' 'gax' 'google-cloud-bigtable' 'libraries-bom')
32+
ARTIFACT_IDS=('google-cloud-shared-dependencies' 'api-common' 'gax' 'google-cloud-bigtable' 'libraries-bom' 'gapic-generator-java')
3333
for ARTIFACT_ID in "${ARTIFACT_IDS[@]}"; do
3434
VERSION=$(grep "^${ARTIFACT_ID}:" versions.txt | cut -d':' -f2 | tr -d '[:space:]')
3535
TAG_NAME="${ARTIFACT_ID}/v$VERSION"

.github/workflows/java-bigtable-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
persist-credentials: false
7272
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
7373
with:
74-
java-version: 11
74+
java-version: 8
7575
distribution: temurin
7676
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
7777
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
9999
with:
100100
distribution: temurin
101-
java-version: 11
101+
java-version: 8
102102
- run: java -version
103103
- run: .kokoro/build.sh
104104
env:

.github/workflows/java-cloud-bom-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
persist-credentials: false
8080
- uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
8181
with:
82-
java-version: 11
82+
java-version: 8
8383
distribution: temurin
8484
cache: 'maven'
8585
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
@@ -112,7 +112,7 @@ jobs:
112112
- uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
113113
with:
114114
distribution: temurin
115-
java-version: 11
115+
java-version: 8
116116
cache: 'maven'
117117
- run: java -version
118118
- name: Pre-install all BOM modules to populate local cache

.github/workflows/java-firestore-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
persist-credentials: false
7272
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
7373
with:
74-
java-version: 11
74+
java-version: 8
7575
distribution: temurin
7676
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
7777
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
9999
with:
100100
distribution: temurin
101-
java-version: 11
101+
java-version: 8
102102
- run: java -version
103103
- run: .kokoro/build.sh
104104
env:

.github/workflows/java-pubsub-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
persist-credentials: false
7272
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
7373
with:
74-
java-version: 11
74+
java-version: 8
7575
distribution: temurin
7676
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
7777
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
9999
with:
100100
distribution: temurin
101-
java-version: 11
101+
java-version: 8
102102
- run: java -version
103103
- run: .kokoro/build.sh
104104
env:

.github/workflows/java-shared-config-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
persist-credentials: false
7272
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
7373
with:
74-
java-version: 11
74+
java-version: 8
7575
distribution: temurin
7676
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
7777
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
9999
with:
100100
distribution: temurin
101-
java-version: 11
101+
java-version: 8
102102
- run: java -version
103103
- run: .kokoro/build.sh
104104
env:

gapic-libraries-bom/pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
<type>pom</type>
5858
<scope>import</scope>
5959
</dependency>
60+
<dependency>
61+
<groupId>com.google.cloud</groupId>
62+
<artifactId>google-cloud-agentidentity-bom</artifactId>
63+
<version>0.1.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-agentidentity:current} -->
64+
<type>pom</type>
65+
<scope>import</scope>
66+
</dependency>
6067
<dependency>
6168
<groupId>com.google.cloud</groupId>
6269
<artifactId>google-cloud-agentregistry-bom</artifactId>
@@ -428,6 +435,13 @@
428435
<type>pom</type>
429436
<scope>import</scope>
430437
</dependency>
438+
<dependency>
439+
<groupId>com.google.cloud</groupId>
440+
<artifactId>google-cloud-commerceproducer-bom</artifactId>
441+
<version>0.1.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-commerceproducer:current} -->
442+
<type>pom</type>
443+
<scope>import</scope>
444+
</dependency>
431445
<dependency>
432446
<groupId>com.google.cloud</groupId>
433447
<artifactId>google-cloud-compute-bom</artifactId>
@@ -1122,6 +1136,13 @@
11221136
<type>pom</type>
11231137
<scope>import</scope>
11241138
</dependency>
1139+
<dependency>
1140+
<groupId>com.google.cloud</groupId>
1141+
<artifactId>google-cloud-productregistry-bom</artifactId>
1142+
<version>0.1.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-productregistry:current} -->
1143+
<type>pom</type>
1144+
<scope>import</scope>
1145+
</dependency>
11251146
<dependency>
11261147
<groupId>com.google.cloud</groupId>
11271148
<artifactId>google-cloud-profiler-bom</artifactId>

google-auth-library-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<properties>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
77-
<project.google.http.version>2.1.1</project.google.http.version>
77+
<project.google.http.version>2.2.0</project.google.http.version>
7878
<project.junit.version>5.11.4</project.junit.version>
7979
<project.guava.version>33.5.0-jre</project.guava.version>
8080
<project.appengine.version>2.0.33</project.appengine.version>

google-cloud-jar-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>ch.qos.logback</groupId>
8888
<artifactId>logback-core</artifactId>
89-
<version>1.5.33</version>
89+
<version>1.5.34</version>
9090
<scope>test</scope>
9191
</dependency>
9292
<dependency>

grpc-gcp-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<api-common.version>2.66.0-SNAPSHOT</api-common.version><!-- {x-version-update:api-common:current} -->
6666
<auto-value.version>1.11.0</auto-value.version>
6767
<error-prone-annotations.version>2.48.0</error-prone-annotations.version>
68-
<google-http-client.version>2.1.1</google-http-client.version>
68+
<google-http-client.version>2.2.0</google-http-client.version>
6969
<gson.version>2.13.2</gson.version>
7070
<guava.version>33.5.0-jre</guava.version>
7171
<protobuf.version>4.33.2</protobuf.version>

0 commit comments

Comments
 (0)