Skip to content

Commit 47c9bd5

Browse files
SailRealSailReal
committed
Merge branch 'main' of github.com:googleapis/google-http-java-client
2 parents 44a6423 + 941038c commit 47c9bd5

169 files changed

Lines changed: 3828 additions & 2008 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/.OwlBot.lock.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/.OwlBot.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.github/generated-files-bot.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/release-please.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,15 @@ branches:
2222
handleGHRelease: true
2323
releaseType: java-backport
2424
branch: 1.43.x
25+
- bumpMinorPreMajor: true
26+
handleGHRelease: true
27+
releaseType: java-backport
28+
branch: 1.44.x
29+
- bumpMinorPreMajor: true
30+
handleGHRelease: true
31+
releaseType: java-backport
32+
branch: 1.46.x
33+
- bumpMinorPreMajor: true
34+
handleGHRelease: true
35+
releaseType: java-backport
36+
branch: 1.47.x

‎.github/sync-repo-settings.yaml‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ branchProtectionRules:
88
requiresCodeOwnerReviews: true
99
requiresStrictStatusChecks: false
1010
requiredStatusCheckContexts:
11-
- units (7)
1211
- units (8)
1312
- units (11)
1413
- windows
@@ -84,6 +83,48 @@ branchProtectionRules:
8483
- dependencies (11)
8584
- clirr
8685
- cla/google
86+
- pattern: 1.44.x
87+
isAdminEnforced: true
88+
requiredApprovingReviewCount: 1
89+
requiresCodeOwnerReviews: true
90+
requiresStrictStatusChecks: false
91+
requiredStatusCheckContexts:
92+
- units (7)
93+
- units (8)
94+
- units (11)
95+
- windows
96+
- dependencies (8)
97+
- dependencies (11)
98+
- clirr
99+
- cla/google
100+
- pattern: 1.46.x
101+
isAdminEnforced: true
102+
requiredApprovingReviewCount: 1
103+
requiresCodeOwnerReviews: true
104+
requiresStrictStatusChecks: false
105+
requiredStatusCheckContexts:
106+
- units (7)
107+
- units (8)
108+
- units (11)
109+
- windows
110+
- dependencies (8)
111+
- dependencies (11)
112+
- clirr
113+
- cla/google
114+
- pattern: 1.47.x
115+
isAdminEnforced: true
116+
requiredApprovingReviewCount: 1
117+
requiresCodeOwnerReviews: true
118+
requiresStrictStatusChecks: false
119+
requiredStatusCheckContexts:
120+
- units (7)
121+
- units (8)
122+
- units (11)
123+
- windows
124+
- dependencies (8)
125+
- dependencies (11)
126+
- clirr
127+
- cla/google
87128
permissionRules:
88129
- team: yoshi-admins
89130
permission: admin

‎.github/trusted-contribution.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
trustedContributors:
22
- renovate-bot
33
- gcf-owl-bot[bot]
4+
5+
annotations:
6+
- type: comment
7+
text: "/gcbrun"
8+
- type: label
9+
text: "kokoro:force-run"

‎.github/workflows/approve-readme.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
2323
steps:
24-
- uses: actions/github-script@v6
24+
- uses: actions/github-script@v7
2525
with:
2626
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
2727
script: |

‎.github/workflows/auto-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
if: contains(github.head_ref, 'release-please')
2323
steps:
24-
- uses: actions/github-script@v6
24+
- uses: actions/github-script@v7
2525
with:
2626
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
2727
debug: true

‎.github/workflows/ci-java7.yaml‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎.github/workflows/ci.yaml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
java: [8, 11, 17]
28+
java: [8, 11, 17, 24]
2929
steps:
30-
- uses: actions/checkout@v3
31-
- uses: actions/setup-java@v3
30+
- uses: actions/checkout@v4
31+
- uses: actions/setup-java@v4
3232
with:
33-
distribution: zulu
33+
distribution: temurin
3434
java-version: ${{matrix.java}}
3535
- run: java -version
3636
- run: .kokoro/build.sh
@@ -41,10 +41,10 @@ jobs:
4141
steps:
4242
- name: Support longpaths
4343
run: git config --system core.longpaths true
44-
- uses: actions/checkout@v3
45-
- uses: actions/setup-java@v3
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-java@v4
4646
with:
47-
distribution: zulu
47+
distribution: temurin
4848
java-version: 8
4949
- run: java -version
5050
- run: .kokoro/build.bat
@@ -54,22 +54,22 @@ jobs:
5454
runs-on: ubuntu-latest
5555
strategy:
5656
matrix:
57-
java: [8, 11, 17]
57+
java: [8, 11, 17, 24]
5858
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-java@v3
59+
- uses: actions/checkout@v4
60+
- uses: actions/setup-java@v4
6161
with:
62-
distribution: zulu
62+
distribution: temurin
6363
java-version: ${{matrix.java}}
6464
- run: java -version
6565
- run: .kokoro/dependencies.sh
6666
lint:
6767
runs-on: ubuntu-latest
6868
steps:
69-
- uses: actions/checkout@v3
70-
- uses: actions/setup-java@v3
69+
- uses: actions/checkout@v4
70+
- uses: actions/setup-java@v4
7171
with:
72-
distribution: zulu
72+
distribution: temurin
7373
java-version: 11
7474
- run: java -version
7575
- run: .kokoro/build.sh
@@ -78,36 +78,36 @@ jobs:
7878
clirr:
7979
runs-on: ubuntu-latest
8080
steps:
81-
- uses: actions/checkout@v3
82-
- uses: actions/setup-java@v3
81+
- uses: actions/checkout@v4
82+
- uses: actions/setup-java@v4
8383
with:
84-
distribution: zulu
84+
distribution: temurin
8585
java-version: 8
8686
- run: java -version
8787
- run: .kokoro/build.sh
8888
env:
8989
JOB_TYPE: clirr
90-
# compilation failure for sub-modules using source and target options 7 (this setting cannot be upgraded to Java 21 because some modules support max of Java 8)
91-
# Hence compile in Java 8 and test in Java 21.
90+
# compilation failure for sub-modules using source and target options 7 (this setting cannot be upgraded to Java 21 because some modules support max of Java 8)
91+
# Hence compile in Java 8 and test in Java 21.
9292
units-java21:
9393
# Building using Java 8 and run the tests with Java 21 runtime
9494
name: "units (21)"
9595
runs-on: ubuntu-latest
9696
steps:
97-
- uses: actions/checkout@v3
98-
- uses: actions/setup-java@v3
99-
with:
100-
java-version: 21
101-
distribution: temurin
102-
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
103-
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
104-
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
105-
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
106-
shell: bash
107-
- uses: actions/setup-java@v3
108-
with:
109-
java-version: 8
110-
distribution: temurin
111-
- run: .kokoro/build.sh
112-
env:
113-
JOB_TYPE: test
97+
- uses: actions/checkout@v4
98+
- uses: actions/setup-java@v4
99+
with:
100+
java-version: 21
101+
distribution: temurin
102+
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
103+
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
104+
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
105+
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
106+
shell: bash
107+
- uses: actions/setup-java@v4
108+
with:
109+
java-version: 8
110+
distribution: temurin
111+
- run: .kokoro/build.sh
112+
env:
113+
JOB_TYPE: test

0 commit comments

Comments
 (0)