Skip to content

Commit 8083f97

Browse files
authored
Merge branch 'main' into release-please--branches--main
2 parents b327a25 + 2e03d84 commit 8083f97

926 files changed

Lines changed: 174833 additions & 8371 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/ci.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,42 +125,49 @@ jobs:
125125
java-bigquery:
126126
- 'java-bigquery/**'
127127
- 'google-auth-library-java/**/*.java'
128+
- 'google-auth-library-java/**/pom.xml'
128129
- 'sdk-platform-java/**/*.java'
129130
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
130131
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
131132
java-bigquerystorage:
132133
- 'java-bigquerystorage/**'
133134
- 'google-auth-library-java/**/*.java'
135+
- 'google-auth-library-java/**/pom.xml'
134136
- 'sdk-platform-java/**/*.java'
135137
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
136138
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
137139
java-datastore:
138140
- 'java-datastore/**'
139141
- 'google-auth-library-java/**/*.java'
142+
- 'google-auth-library-java/**/pom.xml'
140143
- 'sdk-platform-java/**/*.java'
141144
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
142145
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
143146
java-logging-logback:
144147
- 'java-logging-logback/**'
145148
- 'google-auth-library-java/**/*.java'
149+
- 'google-auth-library-java/**/pom.xml'
146150
- 'sdk-platform-java/**/*.java'
147151
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
148152
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
149153
java-logging:
150154
- 'java-logging/**'
151155
- 'google-auth-library-java/**/*.java'
156+
- 'google-auth-library-java/**/pom.xml'
152157
- 'sdk-platform-java/**/*.java'
153158
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
154159
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
155160
java-spanner:
156161
- 'java-spanner/**'
157162
- 'google-auth-library-java/**/*.java'
163+
- 'google-auth-library-java/**/pom.xml'
158164
- 'sdk-platform-java/**/*.java'
159165
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
160166
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
161167
java-storage:
162168
- 'java-storage/**'
163169
- 'google-auth-library-java/**/*.java'
170+
- 'google-auth-library-java/**/pom.xml'
164171
- 'sdk-platform-java/**/*.java'
165172
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
166173
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'

.github/workflows/java-spanner-jdbc-ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ jobs:
3535
library:
3636
- 'java-spanner-jdbc/**'
3737
- '.github/workflows/java-spanner-jdbc-ci.yaml'
38+
- 'google-auth-library-java/**/*.java'
39+
- 'google-auth-library-java/**/pom.xml'
40+
- 'sdk-platform-java/**/*.java'
41+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
42+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
3843
units:
3944
needs: filter
4045
if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/java-storage-nio-ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ jobs:
3535
library:
3636
- 'java-storage-nio/**'
3737
- '.github/workflows/java-storage-nio-ci.yaml'
38+
- 'google-auth-library-java/**/*.java'
39+
- 'google-auth-library-java/**/pom.xml'
40+
- 'sdk-platform-java/**/*.java'
41+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
42+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
3843
units:
3944
needs: filter
4045
if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
filters: |
3030
library:
3131
- 'sdk-platform-java/**'
32+
- 'google-auth-library-java/**'
33+
- '.github/workflows/sdk-platform-java-dependency-compatibility-test.yaml'
3234
dependency-compatibility-test:
3335
needs: filter
3436
if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/sdk-platform-java-downstream.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
filters: |
2424
library:
2525
- 'sdk-platform-java/**'
26+
- 'google-auth-library-java/**'
2627
- .kokoro/downstream-compatibility.sh
2728
- .github/workflows/sdk-platform-java-downstream.yaml
2829
downstream-compatibility:

.github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,17 @@ jobs:
5555
cache: maven
5656
- name: Install the modules of sdk-platform-java
5757
shell: bash
58-
working-directory: google-cloud-java/sdk-platform-java
59-
run: |
60-
set -euo pipefail
61-
# gapic-generator-java is irrelevant
62-
mvn -q -B -ntp install \
63-
-Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
58+
run: .kokoro/build.sh
59+
env:
60+
BUILD_SUBDIR: sdk-platform-java
61+
JOB_TYPE: install
62+
working-directory: google-cloud-java
6463
- name: Build unmanaged dependency check
6564
shell: bash
6665
working-directory: google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
6766
run: |
6867
set -euo pipefail
6968
pwd
70-
pwd
7169
echo "Install Unmanaged Dependency Check in $(pwd)"
7270
mvn clean install -V --batch-mode --no-transfer-progress -DskipTests
7371
- name: Install the modules of the downstream repository

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
env:
17-
BUILD_SUBDIR: sdk-platform-java
1817
JOB_TYPE: install
1918
- name: Unmanaged dependency check
2019
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check

generation_config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
googleapis_commitish: 62e4ecb2f4390728990514fea14aad0431881a52
2-
libraries_bom_version: 26.79.0
1+
googleapis_commitish: 260e3f5d5dcf9692c77d14b01b47c16ef01837e9
2+
libraries_bom_version: 26.80.0
33
is_monorepo: true
44
libraries:
55
- api_shortname: accessapproval
@@ -1558,7 +1558,6 @@ libraries:
15581558
api_id: managedidentities.googleapis.com
15591559
GAPICs:
15601560
- proto_path: google/cloud/managedidentities/v1
1561-
- proto_path: google/cloud/managedidentities/v1beta1
15621561
- api_shortname: managedkafka
15631562
name_pretty: Managed Service for Apache Kafka
15641563
product_documentation: https://cloud.google.com/managed-kafka

java-accessapproval/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.79.0</version>
23+
<version>26.80.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>

java-accesscontextmanager/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.79.0</version>
23+
<version>26.80.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>

0 commit comments

Comments
 (0)