From 96dd2569dff9798506ec942626782b3783a7e663 Mon Sep 17 00:00:00 2001 From: David An Date: Mon, 3 Mar 2025 08:51:39 -0500 Subject: [PATCH] CORE-69: update com.google.cloud:spring-cloud-gcp-starter-logging from 4.9.0 to 6.0.0 (#248) * [CORE-69]: Bump com.google.cloud:spring-cloud-gcp-starter-logging Bumps [com.google.cloud:spring-cloud-gcp-starter-logging](https://github.com/GoogleCloudPlatform/spring-cloud-gcp) from 4.9.0 to 6.0.0. - [Release notes](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/releases) - [Changelog](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/blob/main/CHANGELOG.md) - [Commits](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v4.9.0...v6.0.0) --- updated-dependencies: - dependency-name: com.google.cloud:spring-cloud-gcp-starter-logging dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * scan verifyPacts * disable google java client secret manager --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Talbott --- .github/workflows/verify_consumer_pacts.yml | 2 +- service/build.gradle | 2 +- service/src/main/resources/application.yml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify_consumer_pacts.yml b/.github/workflows/verify_consumer_pacts.yml index b2d7aea5..aadecbbb 100644 --- a/.github/workflows/verify_consumer_pacts.yml +++ b/.github/workflows/verify_consumer_pacts.yml @@ -223,7 +223,7 @@ jobs: echo "env.PROVIDER_BRANCH=${{ env.PROVIDER_BRANCH }} # This reflects the provider branch to switch to for pact verification" echo "env.CONSUMER_VERSION=${{ env.CONSUMER_VERSION }} # This reflects the consumer version for pact verification (generated by Pact Broker)" echo "env.PROVIDER_VERSION=${{ env.PROVIDER_VERSION }} # Deprecate env.PACT_PROVIDER_COMMIT. This new envvar is used for migrating GIT hash to app versioning" - ./gradlew --build-cache verifyPacts + ./gradlew --build-cache verifyPacts --scan can-i-deploy: # The can-i-deploy job will run as a result of a PR. It reports the pact verification statuses on all deployed environments. runs-on: ubuntu-latest diff --git a/service/build.gradle b/service/build.gradle index 4575ef16..1fde1ca2 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation platform('com.google.cloud:libraries-bom:26.55.0') implementation 'com.google.cloud:google-cloud-pubsub' implementation 'com.google.cloud:google-cloud-datastore' - implementation 'com.google.cloud:spring-cloud-gcp-starter-logging:4.9.0' + implementation 'com.google.cloud:spring-cloud-gcp-starter-logging:6.0.0' annotationProcessor 'org.immutables:value:2.10.1' implementation('bio.terra:terra-common-lib:1.1.35-SNAPSHOT') { diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index 3271c12b..2b9fca05 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -69,6 +69,11 @@ spring: application.name: externalcreds application.version: ${externalcreds.version.gitHash:unknown} + cloud: + gcp: + secretmanager: + enabled: false + config.import: classpath:providers.yml,optional:classpath:rendered/version.properties;optional:classpath:rendered/allowed_jwks.yaml;optional:classpath:rendered/allowed_jwt_issuers.yaml datasource: