diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 3d2f8282..8807efca 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,16 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87
+ digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8de66e3f..c6687beb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
General, Core, and Other are also allowed as types
2. OS type and version:
3. Java version:
-4. cloudresourcemanager version(s):
+4. version(s):
#### Steps to reproduce
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index 7513acae..c5132427 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
steps:
- - uses: actions/github-script@v3
+ - uses: actions/github-script@v5
with:
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
script: |
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 9b4fd4d8..59c7cadd 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
if: contains(github.head_ref, 'release-please')
steps:
- - uses: actions/github-script@v3
+ - uses: actions/github-script@v5
with:
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
debug: true
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index ae2c1f58..90f28456 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,15 +47,15 @@ set +e
case ${JOB_TYPE} in
test)
- mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+ mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
RETURN_CODE=$?
;;
lint)
- mvn com.coveo:fmt-maven-plugin:check
+ mvn com.coveo:fmt-maven-plugin:check -B -ntp
RETURN_CODE=$?
;;
javadoc)
- mvn javadoc:javadoc javadoc:test-javadoc
+ mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
RETURN_CODE=$?
;;
integration)
@@ -71,7 +71,7 @@ integration)
;;
graalvm)
# Run Unit and Integration Tests with Native Image
- mvn -ntp -Pnative -Penable-integration-tests test
+ mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
RETURN_CODE=$?
;;
samples)
@@ -104,7 +104,7 @@ samples)
fi
;;
clirr)
- mvn -B -Denforcer.skip=true clirr:check
+ mvn -B -ntp -Denforcer.skip=true clirr:check
RETURN_CODE=$?
;;
*)
diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
new file mode 100644
index 00000000..58049cc3
--- /dev/null
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-public-resources/java11014"
+}
+
+env_vars: {
+ key: "JOB_TYPE"
+ value: "integration"
+}
+# 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: "ENABLE_FLAKYBOT"
+ value: "true"
+}
+
+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/.repo-metadata.json b/.repo-metadata.json
index 52505804..2c4fc1bd 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,10 +1,10 @@
{
- "name": "cloudresourcemanager",
+ "api_shortname": "cloudresourcemanager",
"name_pretty": "Resource Manager API",
"product_documentation": "https://cloud.google.com/resource-manager",
"client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-resourcemanager/latest/history",
"issue_tracker": "https://issuetracker.google.com/savedsearches/559757",
- "release_level": "ga",
+ "release_level": "stable",
"language": "java",
"repo": "googleapis/java-resourcemanager",
"repo_short": "java-resourcemanager",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cd37161..b21f6f2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+### [1.2.2](https://github.com/googleapis/java-resourcemanager/compare/v1.2.1...v1.2.2) (2022-02-03)
+
+
+### Dependencies
+
+* **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/java-resourcemanager/issues/1339)) ([#705](https://github.com/googleapis/java-resourcemanager/issues/705)) ([77f0e48](https://github.com/googleapis/java-resourcemanager/commit/77f0e488158656f500ddbf0fa344b47647db805c))
+* update dependency com.google.apis:google-api-services-cloudresourcemanager to v1-rev20220109-1.32.1 ([#702](https://github.com/googleapis/java-resourcemanager/issues/702)) ([d78edb5](https://github.com/googleapis/java-resourcemanager/commit/d78edb5e857e5f1b9036127a02ee1ce3a8d43217))
+* update dependency com.google.apis:google-api-services-cloudresourcemanager to v3 ([#692](https://github.com/googleapis/java-resourcemanager/issues/692)) ([747e7e0](https://github.com/googleapis/java-resourcemanager/commit/747e7e045624e8a8ef3dce96b3e92e6207a12a84))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#707](https://github.com/googleapis/java-resourcemanager/issues/707)) ([fb064cb](https://github.com/googleapis/java-resourcemanager/commit/fb064cb54aaead53abb113648517f28a7875604e))
+* update dependency com.google.errorprone:error_prone_annotations to v2.11.0 ([#704](https://github.com/googleapis/java-resourcemanager/issues/704)) ([23169df](https://github.com/googleapis/java-resourcemanager/commit/23169df67aa9cd49c976feeb5cfb5f4a6e360dde))
+* update dependency org.easymock:easymock to v4 ([#693](https://github.com/googleapis/java-resourcemanager/issues/693)) ([e68dd34](https://github.com/googleapis/java-resourcemanager/commit/e68dd34311f783a71ef1d04343f0c92fbf226f3c))
+
### [1.2.1](https://www.github.com/googleapis/java-resourcemanager/compare/v1.2.0...v1.2.1) (2022-01-07)
diff --git a/README.md b/README.md
index 879c174d..5aa6377e 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
com.google.cloud
libraries-bom
- 24.1.2
+ 24.2.0
pom
import
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
If you are using Gradle 5.x or later, add this to your dependencies
```Groovy
-implementation platform('com.google.cloud:libraries-bom:24.1.2')
+implementation platform('com.google.cloud:libraries-bom:24.2.0')
implementation 'com.google.cloud:google-cloud-resourcemanager'
```
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-implementation 'com.google.cloud:google-cloud-resourcemanager:1.2.0'
+implementation 'com.google.cloud:google-cloud-resourcemanager:1.2.1'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "1.2.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "1.2.1"
```
## Authentication
@@ -340,7 +340,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-resourcemanager/java8-win.html
[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-resourcemanager/java11.svg
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-resourcemanager/java11.html
-[stability-image]: https://img.shields.io/badge/stability-ga-green
+[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-resourcemanager.svg
[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-resourcemanager&core=gav
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
diff --git a/google-cloud-resourcemanager-bom/pom.xml b/google-cloud-resourcemanager-bom/pom.xml
index 04ed12ee..5600b646 100644
--- a/google-cloud-resourcemanager-bom/pom.xml
+++ b/google-cloud-resourcemanager-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-resourcemanager-bom
- 1.2.1
+ 1.2.2
pom
com.google.cloud
google-cloud-shared-config
- 1.2.4
+ 1.2.6
Google Resource Manager API BOM
@@ -56,17 +56,17 @@
com.google.cloud
google-cloud-resourcemanager
- 1.2.1
+ 1.2.2
com.google.api.grpc
grpc-google-cloud-resourcemanager-v3
- 1.2.1
+ 1.2.2
com.google.api.grpc
proto-google-cloud-resourcemanager-v3
- 1.2.1
+ 1.2.2
diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml
index 6aac927d..0c49b565 100644
--- a/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-resourcemanager/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-resourcemanager
jar
- 1.2.1
+ 1.2.2
Google Cloud Resource Manager
https://github.com/googleapis/java-resourcemanager
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-resourcemanager-parent
- 1.2.1
+ 1.2.2
@@ -61,14 +61,14 @@
com.google.cloud
google-cloud-shared-dependencies
- 2.6.0
+ 2.7.0
pom
import
com.google.errorprone
error_prone_annotations
- 2.10.0
+ 2.11.0
@@ -93,7 +93,7 @@
com.google.apis
google-api-services-cloudresourcemanager
- v1-rev20211107-1.32.1
+ v1-rev20220109-1.32.1
com.google.http-client
@@ -161,7 +161,7 @@
org.easymock
easymock
- 3.6
+ 4.3
test
diff --git a/grpc-google-cloud-resourcemanager-v3/pom.xml b/grpc-google-cloud-resourcemanager-v3/pom.xml
index 603bf8e1..a9c27cf5 100644
--- a/grpc-google-cloud-resourcemanager-v3/pom.xml
+++ b/grpc-google-cloud-resourcemanager-v3/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-resourcemanager-v3
- 1.2.1
+ 1.2.2
grpc-google-cloud-resourcemanager-v3
GRPC library for google-cloud-resourcemanager
com.google.cloud
google-cloud-resourcemanager-parent
- 1.2.1
+ 1.2.2
diff --git a/pom.xml b/pom.xml
index 6746e7c9..950a446b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-resourcemanager-parent
pom
- 1.2.1
+ 1.2.2
Google Resource Manager API Parent
https://github.com/googleapis/java-resourcemanager
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.2.4
+ 1.2.6
@@ -60,23 +60,23 @@
com.google.cloud
google-cloud-resourcemanager
- 1.2.1
+ 1.2.2
com.google.api.grpc
proto-google-cloud-resourcemanager-v3
- 1.2.1
+ 1.2.2
com.google.api.grpc
grpc-google-cloud-resourcemanager-v3
- 1.2.1
+ 1.2.2
com.google.cloud
google-cloud-shared-dependencies
- 2.6.0
+ 2.7.0
pom
import
diff --git a/proto-google-cloud-resourcemanager-v3/pom.xml b/proto-google-cloud-resourcemanager-v3/pom.xml
index 291eddbc..97a30f2e 100644
--- a/proto-google-cloud-resourcemanager-v3/pom.xml
+++ b/proto-google-cloud-resourcemanager-v3/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-resourcemanager-v3
- 1.2.1
+ 1.2.2
proto-google-cloud-resourcemanager-v3
Proto library for google-cloud-resourcemanager
com.google.cloud
google-cloud-resourcemanager-parent
- 1.2.1
+ 1.2.2
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 69275101..bcc014b6 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -53,7 +53,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.2.0
+ 3.3.0
add-snippets-source
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ecfd58ce..facc5b9f 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -52,7 +52,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.2.0
+ 3.3.0
add-snippets-source
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 30a1ee66..658091a7 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 24.1.2
+ 24.2.0
pom
import
diff --git a/versions.txt b/versions.txt
index 10099c19..8a863518 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-google-cloud-resourcemanager:1.2.1:1.2.1
-grpc-google-cloud-resourcemanager-v3:1.2.1:1.2.1
-proto-google-cloud-resourcemanager-v3:1.2.1:1.2.1
+google-cloud-resourcemanager:1.2.2:1.2.2
+grpc-google-cloud-resourcemanager-v3:1.2.2:1.2.2
+proto-google-cloud-resourcemanager-v3:1.2.2:1.2.2