Skip to content

Commit dbc6e63

Browse files
SailRealSailReal
committed
Merge branch 'main' of github.com:googleapis/google-http-java-client
2 parents aaa9924 + 7e91e67 commit dbc6e63

File tree

29 files changed

+117
-99
lines changed

29 files changed

+117
-99
lines changed

‎.github/.OwlBot.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
16+
digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few
55
- [ ] Appropriate docs were updated (if necessary)
66

77
Fixes #<issue_number_goes_here> ☕️
8+
9+
If you write sample code, please follow the [samples format](
10+
https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).

‎.github/sync-repo-settings.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ branchProtectionRules:
1313
- windows
1414
- dependencies (8)
1515
- dependencies (11)
16-
- lint
1716
- clirr
1817
- cla/google
1918
- pattern: 1.39.2-sp

‎.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@v5
24+
- uses: actions/github-script@v6
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@v5
24+
- uses: actions/github-script@v6
2525
with:
2626
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
2727
debug: true

‎.github/workflows/ci.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
matrix:
2828
java: [8, 11, 17]
2929
steps:
30-
- uses: actions/checkout@v2
31-
- uses: actions/setup-java@v2
30+
- uses: actions/checkout@v3
31+
- uses: actions/setup-java@v3
3232
with:
3333
distribution: zulu
3434
java-version: ${{matrix.java}}
@@ -39,8 +39,8 @@ jobs:
3939
windows:
4040
runs-on: windows-latest
4141
steps:
42-
- uses: actions/checkout@v2
43-
- uses: actions/setup-java@v2
42+
- uses: actions/checkout@v3
43+
- uses: actions/setup-java@v3
4444
with:
4545
distribution: zulu
4646
java-version: 8
@@ -54,8 +54,8 @@ jobs:
5454
matrix:
5555
java: [8, 11, 17]
5656
steps:
57-
- uses: actions/checkout@v2
58-
- uses: actions/setup-java@v2
57+
- uses: actions/checkout@v3
58+
- uses: actions/setup-java@v3
5959
with:
6060
distribution: zulu
6161
java-version: ${{matrix.java}}
@@ -64,8 +64,8 @@ jobs:
6464
lint:
6565
runs-on: ubuntu-latest
6666
steps:
67-
- uses: actions/checkout@v2
68-
- uses: actions/setup-java@v2
67+
- uses: actions/checkout@v3
68+
- uses: actions/setup-java@v3
6969
with:
7070
distribution: zulu
7171
java-version: 11
@@ -76,8 +76,8 @@ jobs:
7676
clirr:
7777
runs-on: ubuntu-latest
7878
steps:
79-
- uses: actions/checkout@v2
80-
- uses: actions/setup-java@v2
79+
- uses: actions/checkout@v3
80+
- uses: actions/setup-java@v3
8181
with:
8282
distribution: zulu
8383
java-version: 8

‎.github/workflows/downstream.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,11 @@ jobs:
134134
- workflows
135135
steps:
136136
- uses: actions/checkout@v2
137-
- uses: actions/setup-java@v1
137+
- uses: actions/setup-java@v3
138138
with:
139+
distribution: zulu
139140
java-version: ${{matrix.java}}
140141
- run: java -version
142+
- run: sudo apt-get update -y
141143
- run: sudo apt-get install libxml2-utils
142144
- run: .kokoro/downstream-client-library-check.sh google-http-client-bom ${{matrix.repo}}

‎.kokoro/build.bat

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1+
:: Copyright 2022 Google LLC
2+
::
3+
:: Licensed under the Apache License, Version 2.0 (the "License");
4+
:: you may not use this file except in compliance with the License.
5+
:: You may obtain a copy of the License at
6+
::
7+
:: http://www.apache.org/licenses/LICENSE-2.0
8+
::
9+
:: Unless required by applicable law or agreed to in writing, software
10+
:: distributed under the License is distributed on an "AS IS" BASIS,
11+
:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
:: See the License for the specific language governing permissions and
13+
:: limitations under the License.
14+
:: Github action job to test core java library features on
15+
:: downstream client libraries before they are released.
116
:: See documentation in type-shell-output.bat
2-
# Copyright 2022 Google LLC
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
# Github action job to test core java library features on
16-
# downstream client libraries before they are released.
1717

1818
"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
### [1.41.5](https://github.com/googleapis/google-http-java-client/compare/v1.41.4...v1.41.5) (2022-03-21)
4+
5+
6+
### Documentation
7+
8+
* **deps:** libraries-bom 24.4.0 release ([#1596](https://github.com/googleapis/google-http-java-client/issues/1596)) ([327fe12](https://github.com/googleapis/google-http-java-client/commit/327fe12a122ebb4022a2da55694217233a2badaf))
9+
10+
11+
### Dependencies
12+
13+
* update actions/checkout action to v3 ([#1593](https://github.com/googleapis/google-http-java-client/issues/1593)) ([92002c0](https://github.com/googleapis/google-http-java-client/commit/92002c07d60b738657383e2484f56abc1cde6920))
14+
* update dependency com.fasterxml.jackson.core:jackson-core to v2.13.2 ([#1598](https://github.com/googleapis/google-http-java-client/issues/1598)) ([41ac833](https://github.com/googleapis/google-http-java-client/commit/41ac833249e18cbbd304f825b12202e51bebec85))
15+
* update project.appengine.version to v2 (major) ([#1597](https://github.com/googleapis/google-http-java-client/issues/1597)) ([c06cf95](https://github.com/googleapis/google-http-java-client/commit/c06cf95f9b1be77e2229c3b2f78ece0789eaec15))
16+
317
### [1.41.4](https://github.com/googleapis/google-http-java-client/compare/v1.41.3...v1.41.4) (2022-02-11)
418

519

‎docs/setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`:
2323
<dependency>
2424
<groupId>com.google.cloud</groupId>
2525
<artifactId>libraries-bom</artifactId>
26-
<version>24.3.0</version>
26+
<version>25.0.0</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>

0 commit comments

Comments
 (0)