Skip to content

Commit 6a06b88

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

File tree

28 files changed

+314
-71
lines changed

28 files changed

+314
-71
lines changed

‎.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e
16+
digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813
17+
# created: 2022-04-06T16:30:03.627422514Z

‎.github/auto-label.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright 2021 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+
requestsize:
15+
enabled: true

‎.github/release-please.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ branches:
1010
handleGHRelease: true
1111
releaseType: java-backport
1212
branch: 1.40.x
13+
- bumpMinorPreMajor: true
14+
handleGHRelease: true
15+
releaseType: java-backport
16+
branch: 1.41.x

‎.github/sync-repo-settings.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,19 @@ branchProtectionRules:
4343
- lint
4444
- clirr
4545
- cla/google
46+
- pattern: 1.41.x
47+
isAdminEnforced: true
48+
requiredApprovingReviewCount: 1
49+
requiresCodeOwnerReviews: true
50+
requiresStrictStatusChecks: false
51+
requiredStatusCheckContexts:
52+
- units (8)
53+
- units (11)
54+
- windows
55+
- dependencies (8)
56+
- dependencies (11)
57+
- clirr
58+
- cla/google
4659
permissionRules:
4760
- team: yoshi-admins
4861
permission: admin

‎.kokoro/nightly/integration.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ env_vars: {
1313
# TODO: remove this after we've migrated all tests and scripts
1414
env_vars: {
1515
key: "GCLOUD_PROJECT"
16-
value: "gcloud-devel"
16+
value: "java-docs-samples-testing"
1717
}
1818

1919
env_vars: {
2020
key: "GOOGLE_CLOUD_PROJECT"
21-
value: "gcloud-devel"
21+
value: "java-docs-samples-testing"
2222
}
2323

2424
env_vars: {

‎CHANGELOG.md

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

3+
### [1.41.7](https://github.com/googleapis/google-http-java-client/compare/v1.41.6...v1.41.7) (2022-04-11)
4+
5+
6+
### Dependencies
7+
8+
* revert dependency com.google.protobuf:protobuf-java to v3.19.4 ([#1626](https://github.com/googleapis/google-http-java-client/issues/1626)) ([076433f](https://github.com/googleapis/google-http-java-client/commit/076433f3c233a757f31d5fa39bb6cedbb43b8361))
9+
10+
### [1.41.6](https://github.com/googleapis/google-http-java-client/compare/v1.41.5...v1.41.6) (2022-04-06)
11+
12+
13+
### Bug Fixes
14+
15+
* `Content-Encoding: gzip` along with `Transfer-Encoding: chunked` sometimes terminates early ([#1608](https://github.com/googleapis/google-http-java-client/issues/1608)) ([941da8b](https://github.com/googleapis/google-http-java-client/commit/941da8badf64068d11a53ac57a4ba35b2ad13490))
16+
17+
18+
### Dependencies
19+
20+
* update dependency com.google.errorprone:error_prone_annotations to v2.12.1 ([#1622](https://github.com/googleapis/google-http-java-client/issues/1622)) ([4e1101d](https://github.com/googleapis/google-http-java-client/commit/4e1101d7674cb5715b88a00750cdd5286a9ae077))
21+
* update dependency com.google.protobuf:protobuf-java to v3.20.0 ([#1621](https://github.com/googleapis/google-http-java-client/issues/1621)) ([640dc40](https://github.com/googleapis/google-http-java-client/commit/640dc4080249b65e5cabb7e1ae6cd9cd5b11bd8e))
22+
323
### [1.41.5](https://github.com/googleapis/google-http-java-client/compare/v1.41.4...v1.41.5) (2022-03-21)
424

525

‎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>25.0.0</version>
26+
<version>25.1.0</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>

‎google-http-client-android-test/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>google-http-client</groupId>
55
<artifactId>google-http-client-android-test</artifactId>
66
<name>Test project for google-http-client-android.</name>
7-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
7+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
88
<packaging>apk</packaging>
99

1010
<build>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.http-client</groupId>
5555
<artifactId>google-http-client-android</artifactId>
56-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
56+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
5757
<exclusions>
5858
<exclusion>
5959
<artifactId>android</artifactId>
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>com.google.http-client</groupId>
7474
<artifactId>google-http-client-test</artifactId>
75-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
75+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
7676
<exclusions>
7777
<exclusion>
7878
<artifactId>junit</artifactId>

‎google-http-client-android/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
7+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-android</artifactId>
11-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
11+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
1212
<name>Android Platform Extensions to the Google HTTP Client Library for Java.</name>
1313

1414
<build>

‎google-http-client-apache-v2/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
7+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-apache-v2</artifactId>
11-
<version>1.41.6-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
11+
<version>1.41.8-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
1212
<name>Apache HTTP transport v2 for the Google HTTP Client Library for Java.</name>
1313

1414
<build>

0 commit comments

Comments
 (0)