diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
new file mode 100644
index 0000000000..0a4d759e62
--- /dev/null
+++ b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+ image: gcr.io/repo-automation-bots/owlbot-java:latest
+ digest: sha256:b328758e5113c392d3eccad613c2b18097eaebcb4d8bf77fab0326a6cad90bc7
diff --git a/.github/readme/synth.py b/.github/.OwlBot.yaml
similarity index 73%
rename from .github/readme/synth.py
rename to .github/.OwlBot.yaml
index 7b48cc28d3..8c5f03b4de 100644
--- a/.github/readme/synth.py
+++ b/.github/.OwlBot.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""This script is used to synthesize generated the README for this library."""
-
-from synthtool.languages import java
-
-java.custom_templates(["java_library/README.md"])
+docker:
+ image: "gcr.io/repo-automation-bots/owlbot-java:latest"
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index f78ced25f9..93bd5ae48e 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -31,7 +31,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- "dependencies (8)"
- "dependencies (11)"
- - "linkage-monitor"
- "lint"
- "clirr"
- "units (8)"
@@ -54,7 +53,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- "dependencies (8)"
- "dependencies (11)"
- - "linkage-monitor"
- "lint"
- "clirr"
- "units (7)"
@@ -69,4 +67,4 @@ permissionRules:
- team: yoshi-java-admins
permission: admin
- team: yoshi-java
- permission: push
\ No newline at end of file
+ permission: push
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
index f247d5c789..a0ba1f7d90 100644
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,2 +1,3 @@
trustedContributors:
-- renovate-bot
\ No newline at end of file
+- renovate-bot
+- gcf-owl-bot[bot]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d510359d97..3becb5c022 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,6 +12,9 @@ jobs:
java: [8, 11]
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: ${{matrix.java}}
@@ -23,6 +26,9 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -37,6 +43,9 @@ jobs:
java: [8, 11]
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: ${{matrix.java}}
@@ -46,6 +55,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -57,6 +69,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
+ - uses: stCarolas/setup-maven@v4
+ with:
+ maven-version: 3.8.1
- uses: actions/setup-java@v1
with:
java-version: 8
diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
deleted file mode 100644
index f56d11ea7a..0000000000
--- a/.kokoro/continuous/readme.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020 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.
-
-# Format: //devtools/kokoro/config/proto/build.proto
-
-env_vars: {
- key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
-}
-
-env_vars: {
- key: "TRAMPOLINE_BUILD_FILE"
- value: "github/java-core/.kokoro/readme.sh"
-}
-
-# Build logs will be here
-action {
- define_artifacts {
- regex: "**/*sponge_log.xml"
- regex: "**/*sponge_log.log"
- }
-}
-
-# The github token is stored here.
-before_action {
- fetch_keystore {
- keystore_resource {
- keystore_config_id: 73713
- keyname: "yoshi-automation-github-key"
- # TODO(theacodes): remove this after secrets have globally propagated
- backend_type: FASTCONFIGPUSH
- }
- }
-}
-
-# Common env vars for all repositories and builds.
-env_vars: {
- key: "GITHUB_USER"
- value: "yoshi-automation"
-}
-env_vars: {
- key: "GITHUB_EMAIL"
- value: "yoshi-automation@google.com"
-}
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
index 6e3f65999b..7f78ee414f 100755
--- a/.kokoro/release/common.sh
+++ b/.kokoro/release/common.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
index 5c4551efa2..742ec1a886 100755
--- a/.kokoro/release/drop.sh
+++ b/.kokoro/release/drop.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
index 1fa95fa537..3cac3d8a97 100755
--- a/.kokoro/release/promote.sh
+++ b/.kokoro/release/promote.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index a2b3260b83..df6137ed91 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2019 Google Inc.
+# Copyright 2019 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 2f4c22a67b..9e573b8f61 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2021 Google Inc.
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
index 8a1033843c..77dc4e8f0f 100755
--- a/.kokoro/release/stage.sh
+++ b/.kokoro/release/stage.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
index 9da0f83987..8b69b793c9 100644
--- a/.kokoro/trampoline.sh
+++ b/.kokoro/trampoline.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 Google Inc.
+# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de2b0f051..6a12c65768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [2.1.3](https://www.github.com/googleapis/java-core/compare/v2.1.2...v2.1.3) (2021-09-10)
+
+
+### Dependencies
+
+* update dependency com.google.api:gax-bom to v2.4.1 ([#549](https://www.github.com/googleapis/java-core/issues/549)) ([0b4be35](https://www.github.com/googleapis/java-core/commit/0b4be350d47cab58f3bb4e53d34e913e736a522b))
+
### [2.1.2](https://www.github.com/googleapis/java-core/compare/v2.1.1...v2.1.2) (2021-08-31)
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index 3fcf4d492b..901d3aef38 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.2
+ 2.1.3
pom
com.google.cloud
@@ -42,11 +42,11 @@
sonatype-nexus-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
+ https://google.oss.sonatype.org/content/repositories/snapshots
sonatype-nexus-staging
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
+ https://google.oss.sonatype.org/service/local/staging/deploy/maven2/
@@ -63,17 +63,17 @@
com.google.cloud
google-cloud-core
- 2.1.2
+ 2.1.3
com.google.cloud
google-cloud-core-grpc
- 2.1.2
+ 2.1.3
com.google.cloud
google-cloud-core-http
- 2.1.2
+ 2.1.3
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 02384880e9..3a59a5be8b 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.2
+ 2.1.3
jar
Google Cloud Core gRPC
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.2
+ 2.1.3
google-cloud-core-grpc
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index ad49e865d3..99e5c62ded 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.2
+ 2.1.3
jar
Google Cloud Core HTTP
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.2
+ 2.1.3
google-cloud-core-http
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index f3b8bc587b..a990138f8e 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.2
+ 2.1.3
jar
Google Cloud Core
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.2
+ 2.1.3
google-cloud-core
diff --git a/synth.py b/owlbot.py
similarity index 95%
rename from synth.py
rename to owlbot.py
index b936244fc3..140c4061ba 100644
--- a/synth.py
+++ b/owlbot.py
@@ -16,8 +16,6 @@
import synthtool.languages.java as java
-AUTOSYNTH_MULTIPLE_COMMITS = True
-
java.common_templates(excludes=[
'README.md',
'samples/*',
diff --git a/pom.xml b/pom.xml
index 64b8ca425a..18e71a9238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-core-parent
pom
- 2.1.2
+ 2.1.3
Google Cloud Core Parent
https://github.com/googleapis/java-core
@@ -151,7 +151,7 @@
UTF-8
github
google-cloud-core-parent
- 2.4.0
+ 2.4.1
2.0.2
2.5.0
1.1.0
@@ -356,7 +356,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.3.0
+ 3.3.1
html
diff --git a/renovate.json b/renovate.json
index 2e5d43e9b6..3d8be5619d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -50,7 +50,8 @@
"^junit:junit",
"^com.google.truth:truth",
"^org.mockito:mockito-core",
- "^org.objenesis:objenesis"
+ "^org.objenesis:objenesis",
+ "^com.google.cloud:google-cloud-conformance-tests"
],
"semanticCommitType": "test",
"semanticCommitScope": "deps"
diff --git a/synth.metadata b/synth.metadata
deleted file mode 100644
index 2d72ac289d..0000000000
--- a/synth.metadata
+++ /dev/null
@@ -1,91 +0,0 @@
-{
- "sources": [
- {
- "git": {
- "name": ".",
- "remote": "https://github.com/googleapis/java-core.git",
- "sha": "15e24c75fe220774231ec1cefa6616a834c22cdd"
- }
- },
- {
- "git": {
- "name": "synthtool",
- "remote": "https://github.com/googleapis/synthtool.git",
- "sha": "e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22"
- }
- }
- ],
- "generatedFiles": [
- ".github/CODEOWNERS",
- ".github/ISSUE_TEMPLATE/bug_report.md",
- ".github/ISSUE_TEMPLATE/feature_request.md",
- ".github/ISSUE_TEMPLATE/support_request.md",
- ".github/PULL_REQUEST_TEMPLATE.md",
- ".github/blunderbuss.yml",
- ".github/generated-files-bot.yml",
- ".github/readme/synth.py",
- ".github/release-please.yml",
- ".github/release-trigger.yml",
- ".github/snippet-bot.yml",
- ".github/sync-repo-settings.yaml",
- ".github/trusted-contribution.yml",
- ".github/workflows/approve-readme.yaml",
- ".github/workflows/auto-release.yaml",
- ".github/workflows/ci.yaml",
- ".kokoro/build.bat",
- ".kokoro/build.sh",
- ".kokoro/coerce_logs.sh",
- ".kokoro/common.cfg",
- ".kokoro/common.sh",
- ".kokoro/continuous/common.cfg",
- ".kokoro/continuous/java8.cfg",
- ".kokoro/continuous/readme.cfg",
- ".kokoro/dependencies.sh",
- ".kokoro/nightly/common.cfg",
- ".kokoro/nightly/integration.cfg",
- ".kokoro/nightly/java11.cfg",
- ".kokoro/nightly/java7.cfg",
- ".kokoro/nightly/java8-osx.cfg",
- ".kokoro/nightly/java8-win.cfg",
- ".kokoro/nightly/java8.cfg",
- ".kokoro/nightly/samples.cfg",
- ".kokoro/populate-secrets.sh",
- ".kokoro/presubmit/clirr.cfg",
- ".kokoro/presubmit/common.cfg",
- ".kokoro/presubmit/dependencies.cfg",
- ".kokoro/presubmit/integration.cfg",
- ".kokoro/presubmit/java11.cfg",
- ".kokoro/presubmit/java7.cfg",
- ".kokoro/presubmit/java8-osx.cfg",
- ".kokoro/presubmit/java8-win.cfg",
- ".kokoro/presubmit/java8.cfg",
- ".kokoro/presubmit/linkage-monitor.cfg",
- ".kokoro/presubmit/lint.cfg",
- ".kokoro/presubmit/samples.cfg",
- ".kokoro/readme.sh",
- ".kokoro/release/bump_snapshot.cfg",
- ".kokoro/release/common.cfg",
- ".kokoro/release/common.sh",
- ".kokoro/release/drop.cfg",
- ".kokoro/release/drop.sh",
- ".kokoro/release/promote.cfg",
- ".kokoro/release/promote.sh",
- ".kokoro/release/publish_javadoc.cfg",
- ".kokoro/release/publish_javadoc.sh",
- ".kokoro/release/publish_javadoc11.cfg",
- ".kokoro/release/publish_javadoc11.sh",
- ".kokoro/release/snapshot.cfg",
- ".kokoro/release/snapshot.sh",
- ".kokoro/release/stage.cfg",
- ".kokoro/release/stage.sh",
- ".kokoro/trampoline.sh",
- "CODE_OF_CONDUCT.md",
- "CONTRIBUTING.md",
- "LICENSE",
- "SECURITY.md",
- "codecov.yaml",
- "java.header",
- "license-checks.xml",
- "renovate.json"
- ]
-}
\ No newline at end of file
diff --git a/versions.txt b/versions.txt
index ad5a4130de..00b48a7e65 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-core:2.1.2:2.1.2
\ No newline at end of file
+google-cloud-core:2.1.3:2.1.3
\ No newline at end of file