diff --git a/.github/release-please.yml b/.github/release-please.yml
index 8ca7f9cabc..3dc9356517 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1,3 +1,9 @@
bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
+branches:
+- bumpMinorPreMajor: true
+ handleGHRelease: true
+ releaseType: java-yoshi
+ branch: java7
+
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 6bddd18eac..f78ced25f9 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -34,11 +34,34 @@ branchProtectionRules:
- "linkage-monitor"
- "lint"
- "clirr"
- - "units (7)"
- "units (8)"
- "units (11)"
- "Kokoro - Test: Integration"
- "cla/google"
+- 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)"
+ - "linkage-monitor"
+ - "lint"
+ - "clirr"
+ - "units (7)"
+ - "units (8)"
+ - "units (11)"
+ - "Kokoro - Test: Integration"
+ - "cla/google"
# List of explicit permissions to add (additive only)
permissionRules:
- team: yoshi-admins
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49e6..46edbf7f2f 100755
--- a/.kokoro/coerce_logs.sh
+++ b/.kokoro/coerce_logs.sh
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
echo "coercing sponge logs..."
for xml in `find . -name *-sponge_log.xml`
do
- echo "processing ${xml}"
class=$(basename ${xml} | cut -d- -f2)
dir=$(dirname ${xml})/${job}/${class}
text=$(dirname ${xml})/${class}-sponge_log.txt
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 59d2aafc79..9030ba8f99 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -14,6 +14,7 @@
# limitations under the License.
set -eo pipefail
+shopt -s nullglob
## Get the directory of the build script
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -46,7 +47,7 @@ function completenessCheck() {
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
- mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
+ mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
@@ -70,7 +71,7 @@ function completenessCheck() {
set +e
error_count=0
-for path in $(find -name ".flattened-pom.xml")
+for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b948db7621..1c3b4b27bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
# Changelog
+## [2.0.0](https://www.github.com/googleapis/java-core/compare/v1.95.4...v2.0.0) (2021-07-29)
+
+
+### Features
+
+* promote to 2.0.0 ([#504](https://www.github.com/googleapis/java-core/issues/504)) ([48076ba](https://www.github.com/googleapis/java-core/commit/48076bafa2a89dc6b3ad88a698166da8ebb144f4))
+
+
+### Bug Fixes
+
+* Add shopt -s nullglob to dependencies script ([1fa147c](https://www.github.com/googleapis/java-core/commit/1fa147c9cded08f9eea4a717c622c0b33ad239d0))
+* Update dependencies.sh to not break on mac ([#484](https://www.github.com/googleapis/java-core/issues/484)) ([1fa147c](https://www.github.com/googleapis/java-core/commit/1fa147c9cded08f9eea4a717c622c0b33ad239d0))
+
+
+### Dependencies
+
+* update dependency com.google.api:api-common to v1.10.6 ([#494](https://www.github.com/googleapis/java-core/issues/494)) ([1353d7b](https://www.github.com/googleapis/java-core/commit/1353d7b42dc98110733d279404f9295067f632cf))
+* update dependency com.google.api:api-common to v2 ([#497](https://www.github.com/googleapis/java-core/issues/497)) ([05edb6e](https://www.github.com/googleapis/java-core/commit/05edb6ec2156978b49e72f16de35a935acd43ca8))
+* update dependency com.google.api:gax-bom to v1.66.0 ([#483](https://www.github.com/googleapis/java-core/issues/483)) ([0698c66](https://www.github.com/googleapis/java-core/commit/0698c6679877e0666c684ea5c5daaf8ebae7c15c))
+* update dependency com.google.api:gax-bom to v1.67.0 ([#491](https://www.github.com/googleapis/java-core/issues/491)) ([65f4a1e](https://www.github.com/googleapis/java-core/commit/65f4a1e4ace1ec70cd2a151233c626d80874beb4))
+* update dependency com.google.auth:google-auth-library-bom to v0.27.0 ([#489](https://www.github.com/googleapis/java-core/issues/489)) ([21b0afe](https://www.github.com/googleapis/java-core/commit/21b0afea717805dfd5c93929d2a72de86f048781))
+* update dependency com.google.auth:google-auth-library-bom to v1 ([#496](https://www.github.com/googleapis/java-core/issues/496)) ([9cddefc](https://www.github.com/googleapis/java-core/commit/9cddefc0fdb0eb400121db0faf18bf1bdfdfc7f5))
+* update dependency com.google.errorprone:error_prone_annotations to v2.8.0 ([#492](https://www.github.com/googleapis/java-core/issues/492)) ([acd03c0](https://www.github.com/googleapis/java-core/commit/acd03c00896a1e8f6ab948823e5a5ebd5b741115))
+* update dependency io.grpc:grpc-bom to v1.39.0 ([#482](https://www.github.com/googleapis/java-core/issues/482)) ([02e69d4](https://www.github.com/googleapis/java-core/commit/02e69d46d3b8a71b6286915e08e987a5fc9ce8a6))
+* update guava 30.1.1-jre ([#503](https://www.github.com/googleapis/java-core/issues/503)) ([cac0c63](https://www.github.com/googleapis/java-core/commit/cac0c6367d42afb8af2dec56b9eec4de2e95978e))
+
### [1.95.4](https://www.github.com/googleapis/java-core/compare/v1.95.3...v1.95.4) (2021-06-25)
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index ff3fa9d844..9bfc6c333e 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
- 1.95.4
+ 1.96.0
pom
com.google.cloud
google-cloud-shared-config
- 0.12.0
+ 1.0.0
Google Cloud Core
@@ -63,17 +63,17 @@
com.google.cloud
google-cloud-core
- 1.95.4
+ 1.96.0
com.google.cloud
google-cloud-core-grpc
- 1.95.4
+ 1.96.0
com.google.cloud
google-cloud-core-http
- 1.95.4
+ 1.96.0
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 9b91ac6b6a..2365ed93e2 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
- 1.95.4
+ 1.96.0
jar
Google Cloud Core gRPC
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 1.95.4
+ 1.96.0
google-cloud-core-grpc
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index ccb3409fff..cd0dfb3749 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
- 1.95.4
+ 1.96.0
jar
Google Cloud Core HTTP
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 1.95.4
+ 1.96.0
google-cloud-core-http
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index ce7cbc323a..654c80dc4b 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
- 1.95.4
+ 1.96.0
jar
Google Cloud Core
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 1.95.4
+ 1.96.0
google-cloud-core
diff --git a/java.header b/java.header
index 3a9b503aa2..d0970ba7d3 100644
--- a/java.header
+++ b/java.header
@@ -1,5 +1,5 @@
^/\*$
-^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$
+^ \* Copyright \d\d\d\d,? Google (Inc\.|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/pom.xml b/pom.xml
index 0e254699dc..a8acbb1f1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-core-parent
pom
- 1.95.4
+ 1.96.0
Google Cloud Core Parent
https://github.com/googleapis/java-core
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.12.0
+ 1.0.0
@@ -151,25 +151,25 @@
UTF-8
github
google-cloud-core-parent
- 1.65.1
- 1.10.4
+ 1.67.0
+ 2.0.0
2.3.2
1.0.14
- 0.26.0
+ 1.0.0
1.32.1
1.39.2
- 1.38.1
+ 1.39.0
3.17.3
0.28.0
1.3.2
- 30.1.1-android
+ 30.1.1-jre
4.13.2
1.1.3
3.6
3.0.2
1.5.1
2.6
- 2.7.1
+ 2.8.0
2.8.7
@@ -289,6 +289,12 @@
truth
${truth.version}
test
+
+
+ org.checkerframework
+ checker-qual
+
+
junit
diff --git a/renovate.json b/renovate.json
index d4cc30319d..2e5d43e9b6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -69,5 +69,8 @@
}
],
"semanticCommits": true,
- "masterIssue": true
+ "dependencyDashboard": true,
+ "dependencyDashboardLabels": [
+ "type: process"
+ ]
}
diff --git a/synth.metadata b/synth.metadata
index ac2b4261a3..2a5294e97c 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-core.git",
- "sha": "4195293bd698c0c3a5e5cb80b068354877f7ce9f"
+ "sha": "e9615ea60b30dccfae2e5c4f9247e591dbfeb52f"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
+ "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9"
}
}
],
@@ -81,6 +81,7 @@
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
+ "SECURITY.md",
"codecov.yaml",
"java.header",
"license-checks.xml",
diff --git a/versions.txt b/versions.txt
index c08c10ede5..195c80145f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-core:1.95.4:1.95.4
\ No newline at end of file
+google-cloud-core:1.96.0:1.96.0
\ No newline at end of file