diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 4f14c59880..5ff6c87c1e 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:b328758e5113c392d3eccad613c2b18097eaebcb4d8bf77fab0326a6cad90bc7
+ digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 1a23ea42b1..2176b05432 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,5 @@
# Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
assign_prs_by:
- labels:
- samples
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 93bd5ae48e..5ec649c877 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -11,11 +11,11 @@ squashMergeAllowed: true
# Defaults to `false`
mergeCommitAllowed: false
-# Rules for master branch protection
+# Rules for main branch protection
branchProtectionRules:
# Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `master`
-- pattern: master
+# Defaults to `main`
+- pattern: main
# Can admins overwrite branch protection.
# Defaults to `true`
isAdminEnforced: true
@@ -37,6 +37,7 @@ branchProtectionRules:
- "units (11)"
- "Kokoro - Test: Integration"
- "cla/google"
+ - "OwlBot Post Processor"
- pattern: java7
# Can admins overwrite branch protection.
# Defaults to `true`
@@ -60,6 +61,7 @@ branchProtectionRules:
- "units (11)"
- "Kokoro - Test: Integration"
- "cla/google"
+ - "OwlBot Post Processor"
# List of explicit permissions to add (additive only)
permissionRules:
- team: yoshi-admins
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3becb5c022..2425d7234f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
on:
push:
branches:
- - master
+ - main
pull_request:
name: ci
jobs:
@@ -9,14 +9,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11]
+ java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11]
+ java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9030ba8f99..9a5105d7eb 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
java -version
echo $JOB_TYPE
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+function determineMavenOpts() {
+ local javaVersion=$(
+ # filter down to the version line, then pull out the version between quotes,
+ # then trim the version number down to its minimal number (removing any
+ # update or suffix number).
+ java -version 2>&1 | grep "version" \
+ | sed -E 's/^.*"(.*?)".*$/\1/g' \
+ | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
+ )
+
+ case $javaVersion in
+ "17")
+ # MaxPermSize is no longer supported as of jdk 17
+ echo -n "-Xmx1024m"
+ ;;
+ *)
+ echo -n "-Xmx1024m -XX:MaxPermSize=128m"
+ ;;
+ esac
+}
+
+export MAVEN_OPTS=$(determineMavenOpts)
# this should run maven enforcer
retry_with_backoff 3 10 \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b654a70dc..429a1d14eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
# Changelog
+### [2.1.8](https://www.github.com/googleapis/java-core/compare/v2.1.7...v2.1.8) (2021-10-15)
+
+
+### Dependencies
+
+* update dependency com.google.api-client:google-api-client-bom to v1.32.2 ([#593](https://www.github.com/googleapis/java-core/issues/593)) ([644fc6f](https://www.github.com/googleapis/java-core/commit/644fc6f728b0791c61d85f34c535c09dff862c1d))
+* update dependency com.google.api:api-common to v2.0.4 ([#585](https://www.github.com/googleapis/java-core/issues/585)) ([ad4e4b7](https://www.github.com/googleapis/java-core/commit/ad4e4b7e076d8bd52bf621615301ec810917db43))
+* update dependency com.google.api:api-common to v2.0.5 ([#589](https://www.github.com/googleapis/java-core/issues/589)) ([c30cc40](https://www.github.com/googleapis/java-core/commit/c30cc40cd8687f79c7154503ee1f602089d62f2d))
+* update dependency com.google.api:gax-bom to v2.6.0 ([#594](https://www.github.com/googleapis/java-core/issues/594)) ([710cbe6](https://www.github.com/googleapis/java-core/commit/710cbe6e5121f118a5f4be327e8eeeceddfa04fb))
+* update dependency com.google.api.grpc:proto-google-common-protos to v2.6.0 ([#578](https://www.github.com/googleapis/java-core/issues/578)) ([113b686](https://www.github.com/googleapis/java-core/commit/113b6868f98caa64d713f02729c3f16d878252ff))
+* update dependency com.google.api.grpc:proto-google-iam-v1 to v1.1.3 ([#574](https://www.github.com/googleapis/java-core/issues/574)) ([338444b](https://www.github.com/googleapis/java-core/commit/338444bd4d169bb7fd41242e790c74596948178b))
+* update dependency com.google.api.grpc:proto-google-iam-v1 to v1.1.4 ([#584](https://www.github.com/googleapis/java-core/issues/584)) ([57211ce](https://www.github.com/googleapis/java-core/commit/57211ce15e9b1a4c1b7468fed217e4ab46ec0a5d))
+* update dependency com.google.api.grpc:proto-google-iam-v1 to v1.1.5 ([#587](https://www.github.com/googleapis/java-core/issues/587)) ([55f9f4e](https://www.github.com/googleapis/java-core/commit/55f9f4e084defaf8a243bf21afd67302be802b25))
+* update dependency com.google.api.grpc:proto-google-iam-v1 to v1.1.6 ([#590](https://www.github.com/googleapis/java-core/issues/590)) ([f534c46](https://www.github.com/googleapis/java-core/commit/f534c462fadb479c6fd934c24ac8cd24e06e2698))
+* update dependency com.google.auth:google-auth-library-bom to v1.2.0 ([#581](https://www.github.com/googleapis/java-core/issues/581)) ([c32d2c5](https://www.github.com/googleapis/java-core/commit/c32d2c552dfa04b8e5eab27a115ac10832898473))
+* update dependency com.google.auth:google-auth-library-bom to v1.2.1 ([#591](https://www.github.com/googleapis/java-core/issues/591)) ([046f95d](https://www.github.com/googleapis/java-core/commit/046f95d8ed0811dd278c40fcfeb2c042e6535996))
+* update dependency com.google.guava:guava-bom to v31 ([#577](https://www.github.com/googleapis/java-core/issues/577)) ([4a987fb](https://www.github.com/googleapis/java-core/commit/4a987fbd3f1bd69b0b923fc9a691fc60908ad1cc))
+* update dependency com.google.http-client:google-http-client-bom to v1.40.1 ([#588](https://www.github.com/googleapis/java-core/issues/588)) ([3d36d77](https://www.github.com/googleapis/java-core/commit/3d36d77e6db9856c276d6263036764c60f32b7b3))
+* update dependency com.google.protobuf:protobuf-bom to v3.18.1 ([#583](https://www.github.com/googleapis/java-core/issues/583)) ([47da21c](https://www.github.com/googleapis/java-core/commit/47da21c793be9477323a234f7e3beaf6b705cd7d))
+
### [2.1.7](https://www.github.com/googleapis/java-core/compare/v2.1.6...v2.1.7) (2021-09-23)
diff --git a/README.md b/README.md
index c1ca94e02c..d38313884e 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,9 @@ Java 8 Windows | [](https://storage.googleapis.com/cloud-devrel-public/java/badges/java-core/java11.html)
-[contributing]: https://github.com/googleapis/java-core/blob/master/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-core/blob/master/CODE_OF_CONDUCT.md
-[license]: https://github.com/googleapis/java-core/blob/master/LICENSE
+[contributing]: https://github.com/googleapis/java-core/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-core/blob/main/CODE_OF_CONDUCT.md
+[license]: https://github.com/googleapis/java-core/blob/main/LICENSE
[semver]: http://semver.org/
[cloud-platform]: https://cloud.google.com/
[api-docs]: https://googleapis.dev/java/google-cloud-core/latest
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index 2bcbaef626..3de108d800 100644
--- a/google-cloud-core-bom/pom.xml
+++ b/google-cloud-core-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-core-bom
- 2.1.7
+ 2.1.8
pom
com.google.cloud
google-cloud-shared-config
- 1.0.3
+ 1.1.0
Google Cloud Core
@@ -63,17 +63,17 @@
com.google.cloud
google-cloud-core
- 2.1.7
+ 2.1.8
com.google.cloud
google-cloud-core-grpc
- 2.1.7
+ 2.1.8
com.google.cloud
google-cloud-core-http
- 2.1.7
+ 2.1.8
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 557cf13c75..44d58c323c 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.7
+ 2.1.8
jar
Google Cloud Core gRPC
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.7
+ 2.1.8
google-cloud-core-grpc
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index e92a1260fa..433586c12c 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.7
+ 2.1.8
jar
Google Cloud Core HTTP
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.7
+ 2.1.8
google-cloud-core-http
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index 075be6b8ce..5db43ea669 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.7
+ 2.1.8
jar
Google Cloud Core
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.1.7
+ 2.1.8
google-cloud-core
diff --git a/pom.xml b/pom.xml
index 68c4274a13..a4e9fb67fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-core-parent
pom
- 2.1.7
+ 2.1.8
Google Cloud Core Parent
https://github.com/googleapis/java-core
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.0.3
+ 1.1.0
@@ -151,18 +151,18 @@
UTF-8
github
google-cloud-core-parent
- 2.5.0
- 2.0.2
- 2.5.0
- 1.1.2
- 1.1.0
- 1.32.1
- 1.40.0
+ 2.6.0
+ 2.0.5
+ 2.6.0
+ 1.1.6
+ 1.2.1
+ 1.32.2
+ 1.40.1
1.41.0
- 3.17.3
+ 3.18.1
0.28.0
1.3.2
- 30.1.1-jre
+ 31.0.1-jre
4.13.2
1.1.3
3.6
diff --git a/renovate.json b/renovate.json
index 3d8be5619d..8667c146d4 100644
--- a/renovate.json
+++ b/renovate.json
@@ -70,8 +70,5 @@
}
],
"semanticCommits": true,
- "dependencyDashboard": true,
- "dependencyDashboardLabels": [
- "type: process"
- ]
+ "dependencyDashboard": true
}
diff --git a/versions.txt b/versions.txt
index 14c1e1d972..3aef5a2c3a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-core:2.1.7:2.1.7
\ No newline at end of file
+google-cloud-core:2.1.8:2.1.8
\ No newline at end of file