From 60df3db6e2eaf6fa90f339795965c5e9eb9eef2c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 8 Feb 2022 16:11:44 -0500 Subject: [PATCH 01/24] test: dependency convergence check on gRPC and GAX (#595) * ci: adding dependency convergence check * test: try bad gRPC version * ci: fixed description of the check * test: reverted gRPC version * renaming to gRPC convergence test --- .github/workflows/upper-bound-check.yaml | 23 ---- .github/workflows/version-check.yaml | 41 +++++++ dependency-convergence-check/README.md | 6 + dependency-convergence-check/pom.xml | 76 ++++++++++++ .../cloud/DependencyConvergenceTest.java | 111 ++++++++++++++++++ 5 files changed, 234 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/upper-bound-check.yaml create mode 100644 .github/workflows/version-check.yaml create mode 100644 dependency-convergence-check/README.md create mode 100644 dependency-convergence-check/pom.xml create mode 100644 dependency-convergence-check/src/test/java/com/google/cloud/DependencyConvergenceTest.java diff --git a/.github/workflows/upper-bound-check.yaml b/.github/workflows/upper-bound-check.yaml deleted file mode 100644 index 45cb8b9d..00000000 --- a/.github/workflows/upper-bound-check.yaml +++ /dev/null @@ -1,23 +0,0 @@ -on: - push: - branches: - - main - pull_request: -name: upper-bound-check -jobs: - upper-bound-check: - 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 - - run: java -version - - name: Install the BOM to local Maven repository - run: .kokoro/build.sh - - name: Check the BOM content satisfies the upper-bound-check test case - run: mvn -B -V -ntp verify -Dcheckstyle.skip - working-directory: upper-bound-check diff --git a/.github/workflows/version-check.yaml b/.github/workflows/version-check.yaml new file mode 100644 index 00000000..b78a560f --- /dev/null +++ b/.github/workflows/version-check.yaml @@ -0,0 +1,41 @@ +on: + push: + branches: + - main + pull_request: +name: version-check +jobs: + upper-bound-check: + name: Upper-bound check + 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 + - run: java -version + - name: Install the BOM to local Maven repository + run: .kokoro/build.sh + - name: Check the BOM content satisfies the upper-bound-check test case + run: mvn -B -V -ntp verify -Dcheckstyle.skip + working-directory: upper-bound-check + grpc-convergence-check: + name: gRPC dependency convergence check + 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 + - run: java -version + - name: Install the BOM to local Maven repository + run: .kokoro/build.sh + - name: Check the BOM content satisfies the dependency-convergence-check test + run: mvn -B -V -ntp verify -Dcheckstyle.skip + working-directory: dependency-convergence-check diff --git a/dependency-convergence-check/README.md b/dependency-convergence-check/README.md new file mode 100644 index 00000000..d593196e --- /dev/null +++ b/dependency-convergence-check/README.md @@ -0,0 +1,6 @@ +# Dependency Convergence Check + +This project includes a test case for dependency convergence for some (not all) +artifacts in the Google Cloud Shared Dependencies BOM. + +This project is not meant to be used by end-users or published to Maven Central. diff --git a/dependency-convergence-check/pom.xml b/dependency-convergence-check/pom.xml new file mode 100644 index 00000000..3e0edf56 --- /dev/null +++ b/dependency-convergence-check/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + com.google.cloud + shared-dependencies-dependency-convergence-test + 2.7.0 + Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies + https://github.com/googleapis/java-shared-dependencies + + An dependency convergence test case for the shared dependencies BOM. A failure of this test case means + the shared dependencies BOM has outdated dependencies; there are newer version of artifacts + appearing in the dependency tree. + + + + Google LLC + + + + scm:git:git@github.com:googleapis/java-shared-dependencies.git + scm:git:git@github.com:googleapis/java-shared-dependencies.git + https://github.com/googleapis/java-shared-dependencies + HEAD + + + + https://github.com/googleapis/java-shared-dependencies/issues + GitHub Issues + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + UTF-8 + 1.8 + 1.8 + + + + + + com.google.cloud + google-cloud-shared-dependencies + 2.7.0 + pom + import + + + + + + + com.google.guava + guava + 31.0.1-jre + test + + + com.google.cloud.tools + dependencies + 1.5.12 + test + + + junit + junit + 4.13.1 + test + + + diff --git a/dependency-convergence-check/src/test/java/com/google/cloud/DependencyConvergenceTest.java b/dependency-convergence-check/src/test/java/com/google/cloud/DependencyConvergenceTest.java new file mode 100644 index 00000000..65524383 --- /dev/null +++ b/dependency-convergence-check/src/test/java/com/google/cloud/DependencyConvergenceTest.java @@ -0,0 +1,111 @@ +/* + * 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. + */ + +package com.google.cloud; + +import static org.junit.Assert.assertTrue; + +import com.google.cloud.tools.opensource.classpath.ClassPathBuilder; +import com.google.cloud.tools.opensource.classpath.ClassPathEntry; +import com.google.cloud.tools.opensource.classpath.ClassPathResult; +import com.google.cloud.tools.opensource.classpath.DependencyMediation; +import com.google.cloud.tools.opensource.dependencies.Bom; +import com.google.cloud.tools.opensource.dependencies.DependencyPath; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import java.nio.file.Paths; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.aether.artifact.Artifact; +import org.junit.Test; + +/** + * Test to ensure that certain artifacts in the dependency tree of each entry of the shared + * dependencies BOM have the same version. + */ +public class DependencyConvergenceTest { + + @Test + public void testGrpcConvergence() throws Exception { + // There were cases where the gRPC version set in the shared dependencies BOM and the gRPC + // version declared in gax-grpc's dependency broke the build of downstream projects. Two + // artifacts were using version range to specify exact gRPC versions. + // https://github.com/googleapis/java-shared-dependencies/pull/595 + Bom bom = Bom.readBom(Paths.get("../pom.xml")); + assertConvergence( + bom, + "io.grpc", + "grpc-netty-shaded", + ImmutableSet.of( + // Because OpenCensus's gRPC version does not use version range notation, it does not + // break downstream build + "opencensus-exporter-trace-stackdriver", + "opencensus-exporter-stats-stackdriver", + // Because grpc-gcp's gRPC version does not use version range notation, it does not + // break downstream build + "grpc-gcp")); + } + + /** + * Asserts the artifact specified at {@code groupId} and {@code artifactId} have the same version + * across the dependency trees of the managed dependencies of {@code bom}. + * + *

Use {@code excludingArtifactIds} to ignore certain artifacts. + */ + private void assertConvergence( + Bom bom, String groupId, String artifactId, Set excludingArtifactIds) + throws Exception { + ImmutableList managedDependencies = bom.getManagedDependencies(); + + Set foundPaths = new HashSet<>(); + Set foundVersions = new HashSet<>(); + for (Artifact managedDependency : managedDependencies) { + if (excludingArtifactIds.contains(managedDependency.getArtifactId())) { + continue; + } + + ClassPathBuilder classPathBuilder = new ClassPathBuilder(); + ClassPathResult result = + classPathBuilder.resolve( + ImmutableList.of(managedDependency), false, DependencyMediation.MAVEN); + ImmutableList classPath = result.getClassPath(); + for (ClassPathEntry entry : classPath) { + Artifact artifact = entry.getArtifact(); + if (artifactId.equals(artifact.getArtifactId()) && groupId.equals(artifact.getGroupId())) { + ImmutableList dependencyPaths = result.getDependencyPaths(entry); + foundPaths.add(dependencyPaths.get(0)); + foundVersions.add(artifact.getVersion()); + } + } + } + + assertTrue( + "There should be at least one version in the graph but empty; " + + "please check the assertion is using correct groupID and artifactID.", + foundVersions.size() >= 1); + + // Duplicate versions found in the dependency trees + assertTrue( + "The version for " + + groupId + + ":" + + artifactId + + " should be one but there are multiple of them: " + + Joiner.on(", ").join(foundPaths), + foundVersions.size() <= 1); + } +} From 9bd8ebd5e4aa0a60d48752b358c2ea10caf40b51 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Fri, 11 Feb 2022 14:23:59 -0500 Subject: [PATCH 02/24] chore: downstream check for all libraries in single job (#610) * chore: downstream check for all libraries in single job * Update downstream.yaml * Update downstream.yaml * Update downstream-client-library-check.sh * Update downstream-client-library-check.sh --- .github/workflows/downstream.yaml | 165 ++++++++++++++++++--- .kokoro/client-library-check.sh | 65 -------- .kokoro/downstream-client-library-check.sh | 65 ++++++++ 3 files changed, 211 insertions(+), 84 deletions(-) delete mode 100755 .kokoro/client-library-check.sh create mode 100755 .kokoro/downstream-client-library-check.sh diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index 0f1bc811..794de17c 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -1,30 +1,157 @@ +# 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: - push: - branches: - - main pull_request: + types: [ labeled ] + branches: + - main name: downstream jobs: dependencies: + if: ${{ github.event.label.name == 'downstream-check:run' }} runs-on: ubuntu-latest strategy: fail-fast: false matrix: - java: [8, 11] + java: [17] repo: - - java-bigquery - - java-bigqueryconnection - - java-spanner - - java-storage - - java-pubsub + # This list needs to be updated manually until an automated solution is in place. + - accessapproval + - accesscontextmanager + - aiplatform + - analytics-admin + - analytics-data + - api-gateway + - apigee-connect + - appengine-admin + - area120-tables + - artifact-registry + - asset + - assured-workloads + - automl + - bigquery + - bigqueryconnection + - bigquerydatatransfer + - bigquerymigration + - bigqueryreservation + - bigtable + - billing + - billingbudgets + - binary-authorization + - channel + - cloudbuild + - compute + - contact-center-insights + - container + - containeranalysis + - data-fusion + - datacatalog + - dataflow + - datalabeling + - dataproc + - dataproc-metastore + - datastore + - datastream + - debugger-client + - deploy + - dialogflow + - dialogflow-cx + - dlp + - dms + - dns + - document-ai + - domains + - errorreporting + - essential-contacts + - eventarc + - filestore + - firestore + - functions + - game-servers + - gke-connect-gateway + - gkehub + - gsuite-addons + - iam-admin + - iamcredentials + - iot + - kms + - language + - life-sciences + - logging + - logging-logback + - managed-identities + - mediatranslation + - memcache + - monitoring + - monitoring-dashboards + - network-management + - network-security + - networkconnectivity + - notebooks + - orchestration-airflow + - orgpolicy + - os-config + - os-login + - phishingprotection + - policy-troubleshooter + - private-catalog + - profiler + - pubsublite + - recaptchaenterprise + - recommendations-ai + - recommender + - redis + - resource-settings + - resourcemanager + - retail + - scheduler + - secretmanager + - security-private-ca + - securitycenter + - securitycenter-settings + - service-control + - service-management + - service-usage + - servicedirectory + - shell + - spanner + - spanner-jdbc + - speech + - storage + - storage-nio + - storage-transfer + - talent + - tasks + - texttospeech + - tpu + - trace + - translate + - video-intelligence + - video-transcoder + - vision + - vpcaccess + - webrisk + - websecurityscanner + - workflow-executions + - workflows 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}} - - run: java -version - - run: sudo apt-get install libxml2-utils - - run: .kokoro/client-library-check.sh ${{matrix.repo}} + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get install libxml2-utils + - run: .kokoro/downstream-client-library-check.sh ${{matrix.repo}} diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh deleted file mode 100755 index 0a296b03..00000000 --- a/.kokoro/client-library-check.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# 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. - -# Presubmit to ensure the dependencies of the Google Libraries BOM, with the modification of change -# in the PR, pick up the highest versions among transitive dependencies. -# https://maven.apache.org/enforcer/enforcer-rules/requireUpperBoundDeps.html - -set -eo pipefail -# Display commands being run. -set -x - -if [[ $# -lt 1 ]]; -then - echo "Usage: $0 " - exit 1 -fi -REPO=$1 - -## Get the directory of the build script -scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) -## cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. - -# Make artifacts available for 'mvn validate' at the bottom -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q - -# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' -VERSION_POM=pom.xml -# Namespace (xmlns) prevents xmllint from specifying tag names in XPath -VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` - -if [ -z "${VERSION}" ]; then - echo "Version is not found in ${VERSION_POM}" - exit 1 -fi -echo "Version: ${VERSION}" - -# Check this BOM against a few java client libraries -# java-bigquery -git clone "https://github.com/googleapis/${REPO}.git" --depth=1 -pushd ${REPO} - -# replace version -xmllint --shell <(cat pom.xml) << EOF -setns x=http://maven.apache.org/POM/4.0.0 -cd .//x:artifactId[text()="google-cloud-shared-dependencies"] -cd ../x:version -set ${VERSION} -save pom.xml -EOF - -# run dependencies script -.kokoro/dependencies.sh diff --git a/.kokoro/downstream-client-library-check.sh b/.kokoro/downstream-client-library-check.sh new file mode 100755 index 00000000..b17b020b --- /dev/null +++ b/.kokoro/downstream-client-library-check.sh @@ -0,0 +1,65 @@ +#!/bin/bash +# 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. + +set -eo pipefail +# Display commands being run. +set -x + +CLIENT_LIBRARY=$1 +## Get the directory of the build script +scriptDir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" +## cd to the parent directory, i.e. the root of the git repo +cd "${scriptDir}"/.. + +# Make java core library artifacts available for 'mvn install' at the bottom +mvn verify install -B -V -ntp -fae \ +-DskipTests=true \ +-Dmaven.javadoc.skip=true \ +-Dgcloud.download.skip=true \ +-Denforcer.skip=true + +# Namespace (xmlns) prevents xmllint from specifying tag names in XPath +SHARED_DEPS_VERSION=$(sed -e 's/xmlns=".*"//' pom.xml | xmllint --xpath '/project/version/text()' -) + +if [ -z "${SHARED_DEPS_VERSION}" ]; then + echo "Version is not found in ${SHARED_DEPS_VERSION_POM}" + exit 1 +fi + +# Check this BOM against java client libraries +git clone "https://github.com/googleapis/java-${CLIENT_LIBRARY}.git" --depth=1 +pushd java-"${CLIENT_LIBRARY}" + +if [[ "$CLIENT_LIBRARY" == "bigtable" ]]; then + pushd google-cloud-bigtable-deps-bom +fi + +# replace version +xmllint --shell pom.xml << EOF +setns x=http://maven.apache.org/POM/4.0.0 +cd .//x:artifactId[text()="google-cloud-shared-dependencies"] +cd ../x:version +set ${SHARED_DEPS_VERSION} +save pom.xml +EOF + +if [[ $CLIENT_LIBRARY == "bigtable" ]]; then + popd +fi + +mvn verify install -B -V -ntp -fae \ +-Dmaven.javadoc.skip=true \ +-Dgcloud.download.skip=true \ +-Denforcer.skip=true From ee8a85b48444cff56a3f9b591e9e475d21177f07 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 16:13:11 -0500 Subject: [PATCH 03/24] chore(main): release 2.7.1-SNAPSHOT (#591) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- dependency-convergence-check/pom.xml | 4 ++-- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dependency-convergence-check/pom.xml b/dependency-convergence-check/pom.xml index 3e0edf56..086714d0 100644 --- a/dependency-convergence-check/pom.xml +++ b/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 2.7.0 + 2.7.1-SNAPSHOT Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -46,7 +46,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.7.1-SNAPSHOT pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 1ba2b30d..3d7cb939 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 2.7.0 + 2.7.1-SNAPSHOT Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index ca53517e..6204729a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.7.0 + 2.7.1-SNAPSHOT first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.7.0 + 2.7.1-SNAPSHOT pom import com.google.cloud third-party-dependencies - 2.7.0 + 2.7.1-SNAPSHOT pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 7f498f96..52f75f57 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 2.7.0 + 2.7.1-SNAPSHOT Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index 2909c8b4..97a662c5 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 2.7.0 + 2.7.1-SNAPSHOT Upper bound test for Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -53,7 +53,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.7.1-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index 81bf3ab8..e454e469 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.7.0:2.7.0 \ No newline at end of file +google-cloud-shared-dependencies:2.7.0:2.7.1-SNAPSHOT \ No newline at end of file From 24b79e5f77cb6849e2741811e463a76f3aeaede4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 14:36:06 -0800 Subject: [PATCH 04/24] chore: enable auto release in java (#1349) (#600) * chore: fix auto-release * chore: remove codecov.yml * chore: update license headers for yaml files Source-Link: https://github.com/googleapis/synthtool/commit/5b777277a01a93e7f10c9279521e807b934e78d4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/approve-readme.yaml | 15 +++++++++++ .github/workflows/ci.yaml | 15 +++++++++++ .kokoro/build.bat | 15 +++++++++++ .kokoro/nightly/java11-integration.cfg | 37 ++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 .kokoro/nightly/java11-integration.cfg diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index be3b9bde..a8ddd81a 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:7062473f423f339256346ddbee3d81fb1de6b784fabc2a4d959d7df2c720e375 + digest: sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index c5132427..1bb18232 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -1,3 +1,18 @@ +# 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: auto-merge-readme diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 05de1f60..6b5e56aa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,3 +1,18 @@ +# 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: push: branches: diff --git a/.kokoro/build.bat b/.kokoro/build.bat index 05826ad9..cc602c9e 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,3 +1,18 @@ :: See documentation in type-shell-output.bat +# 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh 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" +} From 2ea1b2084347acdead28510cd3a6c8e7384625dc Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 1 Mar 2022 18:26:46 -0500 Subject: [PATCH 05/24] chore: remove required dependencies check (#619) --- .github/sync-repo-settings.yaml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 957e3c84..4901c249 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -15,12 +15,6 @@ branchProtectionRules: - units (8) - units (11) - 'Kokoro - Test: Integration' - - dependencies (8, java-bigqueryconnection) - - dependencies (8, java-storage) - - dependencies (8, java-pubsub) - - dependencies (11, java-bigqueryconnection) - - dependencies (11, java-storage) - - dependencies (11, java-pubsub) - cla/google - OwlBot Post Processor - pattern: java7 @@ -37,16 +31,6 @@ branchProtectionRules: - units (8) - units (11) - 'Kokoro - Test: Integration' - - dependencies (8, java-bigquery) - - dependencies (8, java-bigqueryconnection) - - dependencies (8, java-spanner) - - dependencies (8, java-storage) - - dependencies (8, java-pubsub) - - dependencies (11, java-bigquery) - - dependencies (11, java-bigqueryconnection) - - dependencies (11, java-spanner) - - dependencies (11, java-storage) - - dependencies (11, java-pubsub) - cla/google - pattern: 2.4.x isAdminEnforced: true @@ -61,12 +45,6 @@ branchProtectionRules: - units (8) - units (11) - 'Kokoro - Test: Integration' - - dependencies (8, java-bigqueryconnection) - - dependencies (8, java-storage) - - dependencies (8, java-pubsub) - - dependencies (11, java-bigqueryconnection) - - dependencies (11, java-storage) - - dependencies (11, java-pubsub) - cla/google - OwlBot Post Processor - pattern: 0.20.x @@ -82,12 +60,6 @@ branchProtectionRules: - units (8) - units (11) - 'Kokoro - Test: Integration' - - dependencies (8, java-bigqueryconnection) - - dependencies (8, java-storage) - - dependencies (8, java-pubsub) - - dependencies (11, java-bigqueryconnection) - - dependencies (11, java-storage) - - dependencies (11, java-pubsub) - cla/google permissionRules: - team: yoshi-admins From 85250654490148eefe6e440c0534918775e1e9ee Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:27:09 -0800 Subject: [PATCH 06/24] chore: update github actions (#1361) (#618) * chore: update github actions * chore: update Source-Link: https://github.com/googleapis/synthtool/commit/1622741e6877d4b335b137ac7e07f7f32d4e5af7 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ .github/workflows/approve-readme.yaml | 2 +- .github/workflows/ci.yaml | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a8ddd81a..53941094 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 + digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c8581001..f17b29f9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb18232..f5fc7d51 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aa..83ef7f9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 From f59c28d8cd30ada1237f7722135ba148dce6315e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:27:18 +0100 Subject: [PATCH 07/24] deps: update dependency com.google.code.gson:gson to v2.9.0 (#611) --- third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 52f75f57..a962da7d 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -57,7 +57,7 @@ UTF-8 ${project.artifactId} - 2.8.9 + 2.9.0 1.5.2 1.3.2 1.20 From 987e61796c7a093e005fe8832cf39275c391b2c1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:30:28 +0100 Subject: [PATCH 08/24] deps: update dependency junit:junit to v4.13.2 (#607) --- dependency-convergence-check/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-convergence-check/pom.xml b/dependency-convergence-check/pom.xml index 086714d0..c842daf3 100644 --- a/dependency-convergence-check/pom.xml +++ b/dependency-convergence-check/pom.xml @@ -69,7 +69,7 @@ junit junit - 4.13.1 + 4.13.2 test From c759579d529234fb230468455f7410cc5305eb0f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:30:39 +0100 Subject: [PATCH 09/24] build(deps): update dependency org.codehaus.mojo:animal-sniffer-annotations to v1.21 (#594) --- third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index a962da7d..a8c9e254 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -60,7 +60,7 @@ 2.9.0 1.5.2 1.3.2 - 1.20 + 1.21 0.31.0 3.0.2 2.11.0 From 3882494770d48fcc02ed19088aa06612a8e440eb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:30:47 +0100 Subject: [PATCH 10/24] deps: update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.1 (#606) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 3d7cb939..e854eb00 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -65,7 +65,7 @@ 2.4.0 1.4.0 1.41.2 - 1.33.0 + 1.33.1 1.33.1 1.2.1 From 0ab5decee701b1d58b552475aa47f0eb37a8a08c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:30:54 +0100 Subject: [PATCH 11/24] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.7 (#604) --- first-party-dependencies/pom.xml | 2 +- pom.xml | 2 +- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index e854eb00..d5996639 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 diff --git a/pom.xml b/pom.xml index 6204729a..4d9f4db3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index a8c9e254..73add040 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index 97a662c5..0bbcaa3e 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -17,7 +17,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 From ca7d49aee26b6d90abd2afd61c20861d2307fe9c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:31:06 +0100 Subject: [PATCH 12/24] deps: update dependency com.google.api:api-common to v2.1.4 (#605) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index d5996639..178ce936 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -60,7 +60,7 @@ 1.1.0 31.0.1-jre 3.19.3 - 2.1.3 + 2.1.4 2.7.2 2.4.0 1.4.0 From 280143964c7c3b93a8d7f67215ba2cc74ffce761 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:32:18 +0100 Subject: [PATCH 13/24] deps: update iam.version to v1.2.6 (#598) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 178ce936..01fd7d68 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -67,7 +67,7 @@ 1.41.2 1.33.1 1.33.1 - 1.2.1 + 1.2.6 From e6413f3b1be78473ace7085c344eda2d78cdf01a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:36:08 +0100 Subject: [PATCH 14/24] deps: update dependency com.google.auth:google-auth-library-bom to v1.5.3 (#614) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 01fd7d68..736f562b 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -63,7 +63,7 @@ 2.1.4 2.7.2 2.4.0 - 1.4.0 + 1.5.3 1.41.2 1.33.1 1.33.1 From 3038a2c86cd20c91b65f2d7926eeb739147a68db Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:36:34 +0100 Subject: [PATCH 15/24] deps: update dependency io.grpc:grpc-bom to v1.44.1 (#613) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 736f562b..61ecec1e 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -55,7 +55,7 @@ UTF-8 ${project.artifactId} - 1.44.0 + 1.44.1 2.11.0 1.1.0 31.0.1-jre From 85b132f5830772646025b6a9fbbb970a941b86b5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:38:12 +0100 Subject: [PATCH 16/24] deps: update dependency com.google.api-client:google-api-client-bom to v1.33.2 (#602) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 61ecec1e..51bbd1ba 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -66,7 +66,7 @@ 1.5.3 1.41.2 1.33.1 - 1.33.1 + 1.33.2 1.2.6 From ac5083cd010924dc128f041c2cdbab20166a6bf0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:38:28 +0100 Subject: [PATCH 17/24] deps: update dependency org.checkerframework:checker-qual to v3.21.3 (#596) --- third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 73add040..ba1b3b39 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -69,7 +69,7 @@ 4.4.15 4.5.13 - 3.21.1 + 3.21.3 From 1e155bfc957bbb7e25d2e0994cdecaa81843bdc5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:38:48 +0100 Subject: [PATCH 18/24] deps: update dependency com.google.protobuf:protobuf-bom to v3.19.4 (#593) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 51bbd1ba..3755280c 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -59,7 +59,7 @@ 2.11.0 1.1.0 31.0.1-jre - 3.19.3 + 3.19.4 2.1.4 2.7.2 2.4.0 From bb9b4c7e39552cc73b3b9d4c826b26e8cb74459f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:39:21 +0100 Subject: [PATCH 19/24] deps: update google.common-protos.version to v2.7.4 (#603) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 3755280c..c0e270c9 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -61,7 +61,7 @@ 31.0.1-jre 3.19.4 2.1.4 - 2.7.2 + 2.7.4 2.4.0 1.5.3 1.41.2 From 713ff8dd94f939c417524616bc47c771a3fbe0cf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:44:18 +0100 Subject: [PATCH 20/24] deps: update gax.version to v2.12.2 (#592) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.api:gax-grpc](https://togithub.com/googleapis/gax-java) | `2.11.0` -> `2.12.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.12.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.12.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.12.2/compatibility-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.12.2/confidence-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.api:gax-bom](https://togithub.com/googleapis/gax-java) | `2.11.0` -> `2.12.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.12.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.12.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.12.2/compatibility-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.12.2/confidence-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

googleapis/gax-java ### [`v2.12.2`](https://togithub.com/googleapis/gax-java/blob/HEAD/CHANGELOG.md#​2122-httpsgithubcomgoogleapisgax-javacomparev2121v2122-2022-02-09) [Compare Source](https://togithub.com/googleapis/gax-java/compare/v2.12.1...v2.12.2) ### [`v2.12.1`](https://togithub.com/googleapis/gax-java/blob/HEAD/CHANGELOG.md#​2121-httpsgithubcomgoogleapisgax-javacomparev2120v2121-2022-02-09) [Compare Source](https://togithub.com/googleapis/gax-java/compare/v2.12.0...v2.12.1) ### [`v2.12.0`](https://togithub.com/googleapis/gax-java/blob/HEAD/CHANGELOG.md#​2120-httpsgithubcomgoogleapisgax-javacomparev2110v2120-2022-01-28) [Compare Source](https://togithub.com/googleapis/gax-java/compare/v2.11.0...v2.12.0) ##### Features - add REST interceptors infrastructure ([#​1607](https://togithub.com/googleapis/gax-java/issues/1607)) ([0572eed](https://togithub.com/googleapis/gax-java/commit/0572eed8aa29879c74794b22e8ae79e414dd5821))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies). --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index c0e270c9..cafd92b9 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -56,7 +56,7 @@ UTF-8 ${project.artifactId} 1.44.1 - 2.11.0 + 2.12.2 1.1.0 31.0.1-jre 3.19.4 From 327d0df9b57203c0d4f426de0380770d3d7910d6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:48:17 +0100 Subject: [PATCH 21/24] deps: update google.core.version (#599) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | `2.4.0` -> `2.5.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core/2.5.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core/2.5.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core/2.5.6/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core/2.5.6/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.cloud:google-cloud-core-bom](https://togithub.com/googleapis/java-core) | `2.4.0` -> `2.5.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core-bom/2.5.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core-bom/2.5.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core-bom/2.5.5/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-core-bom/2.5.5/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-core ### [`v2.5.6`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​256-httpsgithubcomgoogleapisjava-corecomparev255v256-2022-03-01) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.5.5...v2.5.6) ### [`v2.5.5`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​255-httpsgithubcomgoogleapisjava-corecomparev254v255-2022-02-28) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.5.4...v2.5.5) ### [`v2.5.4`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​254-httpsgithubcomgoogleapisjava-corecomparev253v254-2022-02-11) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.5.3...v2.5.4) ### [`v2.5.3`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​253-httpsgithubcomgoogleapisjava-corecomparev252v253-2022-02-10) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.5.2...v2.5.3) ### [`v2.5.2`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​252-httpsgithubcomgoogleapisjava-corecomparev251v252-2022-02-09) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.5.1...v2.5.2) ### [`v2.5.1`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​251-httpsgithubcomgoogleapisjava-corecomparev250v251-2022-02-08) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.5.0...v2.5.1) ### [`v2.5.0`](https://togithub.com/googleapis/java-core/blob/HEAD/CHANGELOG.md#​250-httpsgithubcomgoogleapisjava-corecomparev240v250-2022-02-02) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.4.0...v2.5.0) ##### Features - add limit support to ReadChannel ([#​688](https://togithub.com/googleapis/java-core/issues/688)) ([476109e](https://togithub.com/googleapis/java-core/commit/476109e1943c1a9561cc636ffc64ab8cdd1888f9)) ##### Bug Fixes - **java:** Initialize AsyncSSLPrivateKeyMethod (a grpc netty class) at run-time ([#​702](https://togithub.com/googleapis/java-core/issues/702)) ([24146a3](https://togithub.com/googleapis/java-core/commit/24146a35a10ae06238de9556c24dab5dbd3bcaff)) ##### Dependencies - update dependency com.google.api:gax-bom to v2.12.0 ([#​698](https://togithub.com/googleapis/java-core/issues/698)) ([c10aab8](https://togithub.com/googleapis/java-core/commit/c10aab8a57ff0aad07a700540085e2ed7521b1a1)) - update dependency com.google.protobuf:protobuf-bom to v3.19.4 ([#​699](https://togithub.com/googleapis/java-core/issues/699)) ([5d163f5](https://togithub.com/googleapis/java-core/commit/5d163f591547cd8e0e508b9c824a17da2074b264))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies). --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index cafd92b9..06043b7b 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -62,7 +62,7 @@ 3.19.4 2.1.4 2.7.4 - 2.4.0 + 2.5.5 1.5.3 1.41.2 1.33.1 From f9a4f23d3a32148ac59e53eaae6558ccbceca12c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 00:50:11 +0100 Subject: [PATCH 22/24] deps: update dependency com.google.http-client:google-http-client-bom to v1.41.4 (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.http-client:google-http-client-bom](https://togithub.com/googleapis/google-http-java-client) | `1.41.2` -> `1.41.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.http-client:google-http-client-bom/1.41.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.http-client:google-http-client-bom/1.41.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.http-client:google-http-client-bom/1.41.4/compatibility-slim/1.41.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.http-client:google-http-client-bom/1.41.4/confidence-slim/1.41.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/google-http-java-client ### [`v1.41.4`](https://togithub.com/googleapis/google-http-java-client/blob/HEAD/CHANGELOG.md#​1414-httpsgithubcomgoogleapisgoogle-http-java-clientcomparev1413v1414-2022-02-11) [Compare Source](https://togithub.com/googleapis/google-http-java-client/compare/v1.41.3...v1.41.4) ### [`v1.41.3`](https://togithub.com/googleapis/google-http-java-client/blob/HEAD/CHANGELOG.md#​1413-httpsgithubcomgoogleapisgoogle-http-java-clientcomparev1412v1413-2022-02-09) [Compare Source](https://togithub.com/googleapis/google-http-java-client/compare/v1.41.2...v1.41.3)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies). --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 06043b7b..eccbb649 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -64,7 +64,7 @@ 2.7.4 2.5.5 1.5.3 - 1.41.2 + 1.41.4 1.33.1 1.33.2 1.2.6 From 3d5669f215689dd2df71200ffe37d5a9d385cda8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 01:03:05 +0100 Subject: [PATCH 23/24] deps: update dependency com.google.cloud:google-cloud-core to v2.5.6 (#621) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index eccbb649..00eeb1ad 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -62,7 +62,7 @@ 3.19.4 2.1.4 2.7.4 - 2.5.5 + 2.5.6 1.5.3 1.41.4 1.33.1 From 5331682f5b15879a9ca43694db9c656baa556d34 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 16:34:59 -0800 Subject: [PATCH 24/24] chore(main): release 2.8.0 (#620) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 21 +++++++++++++++++++++ dependency-convergence-check/pom.xml | 4 ++-- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 7 files changed, 31 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5320b813..c6534f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [2.8.0](https://github.com/googleapis/java-shared-dependencies/compare/v2.7.0...v2.8.0) (2022-03-02) + + +### Dependencies + +* update dependency com.google.api-client:google-api-client-bom to v1.33.2 ([#602](https://github.com/googleapis/java-shared-dependencies/issues/602)) ([85b132f](https://github.com/googleapis/java-shared-dependencies/commit/85b132f5830772646025b6a9fbbb970a941b86b5)) +* update dependency com.google.api:api-common to v2.1.4 ([#605](https://github.com/googleapis/java-shared-dependencies/issues/605)) ([ca7d49a](https://github.com/googleapis/java-shared-dependencies/commit/ca7d49aee26b6d90abd2afd61c20861d2307fe9c)) +* update dependency com.google.auth:google-auth-library-bom to v1.5.3 ([#614](https://github.com/googleapis/java-shared-dependencies/issues/614)) ([e6413f3](https://github.com/googleapis/java-shared-dependencies/commit/e6413f3b1be78473ace7085c344eda2d78cdf01a)) +* update dependency com.google.cloud:google-cloud-core to v2.5.6 ([#621](https://github.com/googleapis/java-shared-dependencies/issues/621)) ([3d5669f](https://github.com/googleapis/java-shared-dependencies/commit/3d5669f215689dd2df71200ffe37d5a9d385cda8)) +* update dependency com.google.code.gson:gson to v2.9.0 ([#611](https://github.com/googleapis/java-shared-dependencies/issues/611)) ([f59c28d](https://github.com/googleapis/java-shared-dependencies/commit/f59c28d8cd30ada1237f7722135ba148dce6315e)) +* update dependency com.google.http-client:google-http-client-bom to v1.41.4 ([#608](https://github.com/googleapis/java-shared-dependencies/issues/608)) ([f9a4f23](https://github.com/googleapis/java-shared-dependencies/commit/f9a4f23d3a32148ac59e53eaae6558ccbceca12c)) +* update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.1 ([#606](https://github.com/googleapis/java-shared-dependencies/issues/606)) ([3882494](https://github.com/googleapis/java-shared-dependencies/commit/3882494770d48fcc02ed19088aa06612a8e440eb)) +* update dependency com.google.protobuf:protobuf-bom to v3.19.4 ([#593](https://github.com/googleapis/java-shared-dependencies/issues/593)) ([1e155bf](https://github.com/googleapis/java-shared-dependencies/commit/1e155bfc957bbb7e25d2e0994cdecaa81843bdc5)) +* update dependency io.grpc:grpc-bom to v1.44.1 ([#613](https://github.com/googleapis/java-shared-dependencies/issues/613)) ([3038a2c](https://github.com/googleapis/java-shared-dependencies/commit/3038a2c86cd20c91b65f2d7926eeb739147a68db)) +* update dependency junit:junit to v4.13.2 ([#607](https://github.com/googleapis/java-shared-dependencies/issues/607)) ([987e617](https://github.com/googleapis/java-shared-dependencies/commit/987e61796c7a093e005fe8832cf39275c391b2c1)) +* update dependency org.checkerframework:checker-qual to v3.21.3 ([#596](https://github.com/googleapis/java-shared-dependencies/issues/596)) ([ac5083c](https://github.com/googleapis/java-shared-dependencies/commit/ac5083cd010924dc128f041c2cdbab20166a6bf0)) +* update gax.version to v2.12.2 ([#592](https://github.com/googleapis/java-shared-dependencies/issues/592)) ([713ff8d](https://github.com/googleapis/java-shared-dependencies/commit/713ff8dd94f939c417524616bc47c771a3fbe0cf)) +* update google.common-protos.version to v2.7.4 ([#603](https://github.com/googleapis/java-shared-dependencies/issues/603)) ([bb9b4c7](https://github.com/googleapis/java-shared-dependencies/commit/bb9b4c7e39552cc73b3b9d4c826b26e8cb74459f)) +* update google.core.version ([#599](https://github.com/googleapis/java-shared-dependencies/issues/599)) ([327d0df](https://github.com/googleapis/java-shared-dependencies/commit/327d0df9b57203c0d4f426de0380770d3d7910d6)) +* update iam.version to v1.2.6 ([#598](https://github.com/googleapis/java-shared-dependencies/issues/598)) ([2801439](https://github.com/googleapis/java-shared-dependencies/commit/280143964c7c3b93a8d7f67215ba2cc74ffce761)) + ## [2.7.0](https://github.com/googleapis/java-shared-dependencies/compare/v2.6.0...v2.7.0) (2022-01-28) diff --git a/dependency-convergence-check/pom.xml b/dependency-convergence-check/pom.xml index c842daf3..b505e55e 100644 --- a/dependency-convergence-check/pom.xml +++ b/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 2.7.1-SNAPSHOT + 2.8.0 Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -46,7 +46,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.1-SNAPSHOT + 2.8.0 pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 00eeb1ad..2e1d52d6 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 2.7.1-SNAPSHOT + 2.8.0 Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index 4d9f4db3..48c6ab58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.7.1-SNAPSHOT + 2.8.0 first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.7.1-SNAPSHOT + 2.8.0 pom import com.google.cloud third-party-dependencies - 2.7.1-SNAPSHOT + 2.8.0 pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index ba1b3b39..ae2743dc 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 2.7.1-SNAPSHOT + 2.8.0 Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index 0bbcaa3e..d090fdf3 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 2.7.1-SNAPSHOT + 2.8.0 Upper bound test for Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -53,7 +53,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.1-SNAPSHOT + 2.8.0 pom import diff --git a/versions.txt b/versions.txt index e454e469..da7da057 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.7.0:2.7.1-SNAPSHOT \ No newline at end of file +google-cloud-shared-dependencies:2.8.0:2.8.0 \ No newline at end of file