Skip to content

Commit ef69ce2

Browse files
diegomarquezpdiegomarquezp
authored
Merge branch 'main' into main
2 parents 25ad44d + 5d0689a commit ef69ce2

File tree

22 files changed

+94
-125
lines changed

22 files changed

+94
-125
lines changed

‎.github/release-please.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ branches:
3030
handleGHRelease: true
3131
releaseType: java-backport
3232
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: 14 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
@@ -112,6 +111,20 @@ branchProtectionRules:
112111
- dependencies (11)
113112
- clirr
114113
- 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
115128
permissionRules:
116129
- team: yoshi-admins
117130
permission: admin

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

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

‎CHANGELOG.md‎

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

3+
## [2.0.0](https://github.com/googleapis/google-http-java-client/compare/v1.47.1...v2.0.0) (2025-08-08)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* update guava to 33.4.8-android ([#2112](https://github.com/googleapis/google-http-java-client/issues/2112))
9+
10+
### Features
11+
12+
* Next release from main branch is 1.48.0 ([#2110](https://github.com/googleapis/google-http-java-client/issues/2110)) ([33c6793](https://github.com/googleapis/google-http-java-client/commit/33c6793487c082e7ff7288983b5d64611b433a55))
13+
14+
15+
### Dependencies
16+
17+
* Update guava to 33.4.8-android ([#2112](https://github.com/googleapis/google-http-java-client/issues/2112)) ([941038c](https://github.com/googleapis/google-http-java-client/commit/941038c81b99c4eaaab8935349d7b652362ab20c))
18+
319
## [1.47.1](https://github.com/googleapis/google-http-java-client/compare/v1.47.0...v1.47.1) (2025-06-23)
420

521

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ content. The JSON and XML libraries are also fully pluggable, and they include s
1717

1818
The library supports the following Java environments:
1919

20-
- Java 7 or higher
21-
- The google-http-client-jackson2 and google-http-client-appengine modules require Java 8 or
22-
higher due to their dependencies.
20+
- Java 8 or higher
2321
- Android 4.4 (Kit Kat)
2422
- GoogleAppEngine Google App Engine
2523

‎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.47.1</version><!-- {x-version-update:google-http-client-android-test:current} -->
7+
<version>2.0.0</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.47.1</version><!-- {x-version-update:google-http-client-android:current} -->
56+
<version>2.0.0</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.47.1</version><!-- {x-version-update:google-http-client-test:current} -->
75+
<version>2.0.0</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.47.1</version><!-- {x-version-update:google-http-client-parent:current} -->
7+
<version>2.0.0</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.47.1</version><!-- {x-version-update:google-http-client-android:current} -->
11+
<version>2.0.0</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.47.1</version><!-- {x-version-update:google-http-client-parent:current} -->
7+
<version>2.0.0</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.47.1</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
11+
<version>2.0.0</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>

‎google-http-client-apache-v5/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.47.1</version><!-- {x-version-update:google-http-client-parent:current} -->
7+
<version>2.0.0</version><!-- {x-version-update:google-http-client-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-apache-v5</artifactId>
11-
<version>1.47.1</version><!-- {x-version-update:google-http-client-apache-v5:current} -->
11+
<version>2.0.0</version><!-- {x-version-update:google-http-client-apache-v5:current} -->
1212
<name>Apache HTTP transport v5 for the Google HTTP Client Library for Java.</name>
1313

1414
<build>

‎google-http-client-appengine/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.47.1</version><!-- {x-version-update:google-http-client-parent:current} -->
7+
<version>2.0.0</version><!-- {x-version-update:google-http-client-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-appengine</artifactId>
11-
<version>1.47.1</version><!-- {x-version-update:google-http-client-appengine:current} -->
11+
<version>2.0.0</version><!-- {x-version-update:google-http-client-appengine:current} -->
1212
<name>Google App Engine extensions to the Google HTTP Client Library for Java.</name>
1313

1414
<build>

0 commit comments

Comments
 (0)