diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index cb4ea018e..c1e4d2da2 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a
+ digest: sha256:a57d2ea6d1a77aa96c17ad0850b779ec6295f88b6c1da3d214b2095d140a2066
diff --git a/.github/release-please.yml b/.github/release-please.yml
index 918b136f6..808e1c9f7 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -14,3 +14,7 @@ branches:
handleGHRelease: true
releaseType: java-backport
branch: 1.34.x
+ - bumpMinorPreMajor: true
+ handleGHRelease: true
+ releaseType: java-backport
+ branch: 2.0.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 8ba866728..0ac178c7d 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -59,6 +59,20 @@ branchProtectionRules:
- lint
- clirr
- cla/google
+ - pattern: 2.0.x
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - units (8)
+ - units (11)
+ - windows
+ - dependencies (8)
+ - dependencies (11)
+ - lint
+ - clirr
+ - cla/google
permissionRules:
- team: yoshi-admins
permission: admin
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index 6aa7cf2b5..924f94ae6 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -1,7 +1,8 @@
gcp-docuploader==0.6.3
google-crc32c==1.3.0
googleapis-common-protos==1.56.3
-gcp-releasetool==1.8.7
+gcp-releasetool==1.9.1
+cryptography==38.0.3
cachetools==4.2.4
cffi==1.15.1
jeepney==0.7.1
@@ -29,5 +30,5 @@ zipp==3.6.0
rsa==4.9
six==1.16.0
attrs==22.1.0
-google-auth==2.11.0
+google-auth==2.14.1
idna==3.4
\ No newline at end of file
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 02ae42bb4..71fcafc70 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
-# pip-compile --allow-unsafe --generate-hashes requirements.in
+# pip-compile --generate-hashes requirements.in
#
attrs==22.1.0 \
--hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
@@ -104,43 +104,44 @@ colorlog==6.7.0 \
--hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
--hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
# via gcp-docuploader
-cryptography==38.0.1 \
- --hash=sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a \
- --hash=sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f \
- --hash=sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0 \
- --hash=sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 \
- --hash=sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7 \
- --hash=sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6 \
- --hash=sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153 \
- --hash=sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750 \
- --hash=sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad \
- --hash=sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6 \
- --hash=sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b \
- --hash=sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5 \
- --hash=sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a \
- --hash=sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d \
- --hash=sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d \
- --hash=sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294 \
- --hash=sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0 \
- --hash=sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a \
- --hash=sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac \
- --hash=sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61 \
- --hash=sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013 \
- --hash=sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e \
- --hash=sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb \
- --hash=sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9 \
- --hash=sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd \
- --hash=sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818
+cryptography==38.0.3 \
+ --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \
+ --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \
+ --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \
+ --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \
+ --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \
+ --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \
+ --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \
+ --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \
+ --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \
+ --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \
+ --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \
+ --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \
+ --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \
+ --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \
+ --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \
+ --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \
+ --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \
+ --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \
+ --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \
+ --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \
+ --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \
+ --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \
+ --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \
+ --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \
+ --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \
+ --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722
# via
+ # -r requirements.in
# gcp-releasetool
# secretstorage
gcp-docuploader==0.6.3 \
--hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
--hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
# via -r requirements.in
-gcp-releasetool==1.8.7 \
- --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \
- --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d
+gcp-releasetool==1.9.1 \
+ --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \
+ --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b
# via -r requirements.in
google-api-core==2.8.2 \
--hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
@@ -149,9 +150,8 @@ google-api-core==2.8.2 \
# -r requirements.in
# google-cloud-core
# google-cloud-storage
-google-auth==2.11.0 \
- --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \
- --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb
+google-auth==2.14.1 \
+ --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016
# via
# -r requirements.in
# gcp-releasetool
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a85d2be51..fa5532b53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## [2.1.0](https://github.com/googleapis/google-api-java-client/compare/v2.0.1...v2.1.0) (2022-11-29)
+
+
+### Features
+
+* Next release from main branch is 2.1.0 ([#2179](https://github.com/googleapis/google-api-java-client/issues/2179)) ([0b39ce1](https://github.com/googleapis/google-api-java-client/commit/0b39ce1f50a1ccb49519d25d689b76e061791bb5))
+
+
+### Bug Fixes
+
+* **deps:** Update dependency com.google.api-client:google-api-client to v2.0.1 ([#2176](https://github.com/googleapis/google-api-java-client/issues/2176)) ([7cb91f7](https://github.com/googleapis/google-api-java-client/commit/7cb91f70941e6c34b231aa367c7015cd9c0d346d))
+* **deps:** Update dependency com.google.cloud:libraries-bom to v26.1.4 ([#2177](https://github.com/googleapis/google-api-java-client/issues/2177)) ([0e3be64](https://github.com/googleapis/google-api-java-client/commit/0e3be649b487e933be604022913375ec180e3fc2))
+* Update and declare commons-codec dependency ([#2195](https://github.com/googleapis/google-api-java-client/issues/2195)) ([ad7f8ae](https://github.com/googleapis/google-api-java-client/commit/ad7f8ae6522baf6318de60976dcc842b77f8541e))
+
## [2.0.1](https://github.com/googleapis/google-api-java-client/compare/v2.0.0...v2.0.1) (2022-11-05)
diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml
index e4e62bd55..8fac31481 100644
--- a/google-api-client-android/pom.xml
+++ b/google-api-client-android/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-android
diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index 950994c15..44c83a115 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-appengine
diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml
index 66df877fc..43defd67e 100644
--- a/google-api-client-assembly/pom.xml
+++ b/google-api-client-assembly/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
com.google.api-client
diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml
index 783adec7d..162a8e009 100644
--- a/google-api-client-bom/pom.xml
+++ b/google-api-client-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.api-client
google-api-client-bom
- 2.0.1
+ 2.1.0
pom
Google API Client Library for Java BOM
@@ -63,53 +63,53 @@
com.google.api-client
google-api-client
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-android
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-appengine
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-assembly
- 2.0.1
+ 2.1.0
pom
com.google.api-client
google-api-client-gson
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-jackson2
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-java6
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-protobuf
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-servlet
- 2.0.1
+ 2.1.0
com.google.api-client
google-api-client-xml
- 2.0.1
+ 2.1.0
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index ff9aff72f..0c8d4b673 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-gson
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index 002644925..e67892566 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-jackson2
diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
index 65c769521..4e0b64bfc 100644
--- a/google-api-client-java6/pom.xml
+++ b/google-api-client-java6/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-java6
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 5224496ed..1ce26fa6b 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-protobuf
@@ -14,7 +14,7 @@
kr.motd.maven
os-maven-plugin
- 1.7.0
+ 1.7.1
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index d86d09adc..cc9ea968e 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-servlet
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index f0bc6c192..484687c3b 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client-xml
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index c5d7f69f6..304508827 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -4,7 +4,7 @@
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
../pom.xml
google-api-client
@@ -14,7 +14,7 @@
kr.motd.maven
os-maven-plugin
- 1.7.0
+ 1.7.1
diff --git a/pom.xml b/pom.xml
index 52e099ccd..9796d1400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.google.api-client
google-api-client-parent
- 2.0.1
+ 2.1.0
pom
Parent for the Google API Client Library for Java
The Google APIs Client Library for Java is a Java client library
@@ -203,6 +203,11 @@
google-api-client-xml
${project.version}
+
+ commons-codec
+ commons-codec
+ ${project.commons-codec.version}
+
@@ -496,6 +501,7 @@
1.42.3
4.4.15
4.5.13
+ 1.15
1.34.1
3.0.2
2.8.6
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index beb065886..db79cb898 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.api-client
google-api-client
- 2.0.0
+ 2.0.1
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index d242043c3..36055ec21 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.api-client
google-api-client
- 2.0.0
+ 2.0.1
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 997850174..320fefc14 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 26.1.2
+ 26.1.4
pom
import
diff --git a/versions.txt b/versions.txt
index 3ac5b3285..b0393d96e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-api-client:2.0.1:2.0.1
+google-api-client:2.1.0:2.1.0