diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 5ff6c87c1e..dc53bbb57b 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5
+ digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875
diff --git a/.github/release-please.yml b/.github/release-please.yml
index 3dc9356517..a43dbc35f8 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -2,8 +2,11 @@ bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
branches:
-- bumpMinorPreMajor: true
- handleGHRelease: true
- releaseType: java-yoshi
- branch: java7
-
+ - bumpMinorPreMajor: true
+ handleGHRelease: true
+ releaseType: java-yoshi
+ branch: java7
+ - bumpMinorPreMajor: true
+ handleGHRelease: true
+ releaseType: java-backport
+ branch: 2.1.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 5ec649c877..b97f6f3392 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -1,72 +1,57 @@
-
-# Whether or not rebase-merging is enabled on this repository.
-# Defaults to `true`
rebaseMergeAllowed: false
-
-# Whether or not squash-merging is enabled on this repository.
-# Defaults to `true`
squashMergeAllowed: true
-
-# Whether or not PRs are merged with a merge commit on this repository.
-# Defaults to `false`
mergeCommitAllowed: false
-
-# Rules for main branch protection
branchProtectionRules:
-# Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `main`
-- pattern: main
- # Can admins overwrite branch protection.
- # Defaults to `true`
- isAdminEnforced: true
- # Number of approving reviews required to update matching branches.
- # Defaults to `1`
- requiredApprovingReviewCount: 1
- # Are reviews from code owners required to update matching branches.
- # Defaults to `false`
- requiresCodeOwnerReviews: true
- # Require up to date branches
- requiresStrictStatusChecks: false
- # List of required status check contexts that must pass for commits to be accepted to matching branches.
- requiredStatusCheckContexts:
- - "dependencies (8)"
- - "dependencies (11)"
- - "lint"
- - "clirr"
- - "units (8)"
- - "units (11)"
- - "Kokoro - Test: Integration"
- - "cla/google"
- - "OwlBot Post Processor"
-- pattern: java7
- # Can admins overwrite branch protection.
- # Defaults to `true`
- isAdminEnforced: true
- # Number of approving reviews required to update matching branches.
- # Defaults to `1`
- requiredApprovingReviewCount: 1
- # Are reviews from code owners required to update matching branches.
- # Defaults to `false`
- requiresCodeOwnerReviews: true
- # Require up to date branches
- requiresStrictStatusChecks: false
- # List of required status check contexts that must pass for commits to be accepted to matching branches.
- requiredStatusCheckContexts:
- - "dependencies (8)"
- - "dependencies (11)"
- - "lint"
- - "clirr"
- - "units (7)"
- - "units (8)"
- - "units (11)"
- - "Kokoro - Test: Integration"
- - "cla/google"
- - "OwlBot Post Processor"
-# List of explicit permissions to add (additive only)
+ - pattern: main
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (8)
+ - dependencies (11)
+ - lint
+ - clirr
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - cla/google
+ - OwlBot Post Processor
+ - pattern: java7
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (8)
+ - dependencies (11)
+ - lint
+ - clirr
+ - units (7)
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - cla/google
+ - OwlBot Post Processor
+ - pattern: 2.1.x
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (8)
+ - dependencies (11)
+ - lint
+ - clirr
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - cla/google
+ - OwlBot Post Processor
permissionRules:
-- team: yoshi-admins
- permission: admin
-- team: yoshi-java-admins
- permission: admin
-- team: yoshi-java
- permission: push
+ - team: yoshi-admins
+ permission: admin
+ - team: yoshi-java-admins
+ permission: admin
+ - team: yoshi-java
+ permission: push
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 08abe50520..c09fee43e6 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -69,6 +69,11 @@ integration)
verify
RETURN_CODE=$?
;;
+graalvm)
+ # Run Unit and Integration Tests with Native Image
+ mvn test -Pnative -Penable-integration-tests
+ RETURN_CODE=$?
+ ;;
samples)
SAMPLES_DIR=samples
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
new file mode 100644
index 0000000000..4c7225ec92
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+}
+
+env_vars: {
+ key: "JOB_TYPE"
+ value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+ key: "GCLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "GOOGLE_CLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+ key: "SECRET_MANAGER_KEYS"
+ value: "java-it-service-account"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429a1d14eb..2a30c81a54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## [2.2.0](https://www.github.com/googleapis/java-core/compare/v2.1.8...v2.2.0) (2021-10-18)
+
+
+### Features
+
+* next release from main branch is 2.2.0 ([#596](https://www.github.com/googleapis/java-core/issues/596)) ([cca72b8](https://www.github.com/googleapis/java-core/commit/cca72b82b45e01207bd45c6a2b988981c213c6fd))
+
+
+### Dependencies
+
+* update dependency com.google.api:gax-bom to v2.6.1 ([#600](https://www.github.com/googleapis/java-core/issues/600)) ([a0cff6a](https://www.github.com/googleapis/java-core/commit/a0cff6a83506d1da3a8aacd6eafc39ff1ab11583))
+
### [2.1.8](https://www.github.com/googleapis/java-core/compare/v2.1.7...v2.1.8) (2021-10-15)
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index 3de108d800..da77e11abc 100644
--- a/google-cloud-core-bom/pom.xml
+++ b/google-cloud-core-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-bom
- 2.1.8
+ 2.2.0
pom
com.google.cloud
@@ -63,17 +63,17 @@
com.google.cloud
google-cloud-core
- 2.1.8
+ 2.2.0
com.google.cloud
google-cloud-core-grpc
- 2.1.8
+ 2.2.0
com.google.cloud
google-cloud-core-http
- 2.1.8
+ 2.2.0
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 44d58c323c..0f79accabb 100644
--- a/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-core-grpc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-grpc
- 2.1.8
+ 2.2.0
jar
Google Cloud Core gRPC
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.8
+ 2.2.0
google-cloud-core-grpc
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index 433586c12c..300c7a92c8 100644
--- a/google-cloud-core-http/pom.xml
+++ b/google-cloud-core-http/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-http
- 2.1.8
+ 2.2.0
jar
Google Cloud Core HTTP
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.8
+ 2.2.0
google-cloud-core-http
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index 5db43ea669..171cd7b58e 100644
--- a/google-cloud-core/pom.xml
+++ b/google-cloud-core/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core
- 2.1.8
+ 2.2.0
jar
Google Cloud Core
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.8
+ 2.2.0
google-cloud-core
diff --git a/pom.xml b/pom.xml
index a4e9fb67fd..42418d6300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-core-parent
pom
- 2.1.8
+ 2.2.0
Google Cloud Core Parent
https://github.com/googleapis/java-core
@@ -151,7 +151,7 @@
UTF-8
github
google-cloud-core-parent
- 2.6.0
+ 2.6.1
2.0.5
2.6.0
1.1.6
diff --git a/versions.txt b/versions.txt
index 3aef5a2c3a..8127a52965 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-core:2.1.8:2.1.8
\ No newline at end of file
+google-cloud-core:2.2.0:2.2.0
\ No newline at end of file