Skip to content

deps(shared-deps): migrate awaitility to shared-dependencies#13671

Merged
lqiu96 merged 8 commits into
mainfrom
migrate-awaitility-shared-deps
Jul 8, 2026
Merged

deps(shared-deps): migrate awaitility to shared-dependencies#13671
lqiu96 merged 8 commits into
mainfrom
migrate-awaitility-shared-deps

Conversation

@lqiu96

@lqiu96 lqiu96 commented Jul 6, 2026

Copy link
Copy Markdown
Member

Move awaitility dependency management to java-shared-dependencies so that it can be managed centrally in the monorepo. Remove local awaitility version override from java-spanner.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request centralizes the dependency management for Awaitility by removing the local version property and dependency version declaration from the google-cloud-spanner POM, and moving the awaitility dependency definition to the shared third-party-dependencies POM. There are no review comments, and I have no feedback to provide.

@lqiu96 lqiu96 requested review from blakeli0 and jinseopkim0 July 7, 2026 03:49
Comment thread java-storage/google-cloud-storage/pom.xml Outdated
lqiu96 added 5 commits July 7, 2026 04:51
Move awaitility dependency management to java-shared-dependencies
so that it can be managed centrally in the monorepo.
Remove local awaitility version override from java-spanner.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
Remove local awaitility version override from java-datastore.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
Bump logback-classic to 1.5.33 in google-cloud-jar-parent to match
logback-core. Remove local logback-classic override in google-cloud-storage
which was causing AbstractMethodError due to version mismatch.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
…lity

Override both logback-classic and logback-core to 1.3.16 in
google-cloud-storage to support running tests on Java 8 runtime,
as Logback 1.5.x requires Java 11+.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
…e override

Add a `java8-logback` profile in `google-cloud-jar-parent` to downgrade
logback dependencies to `1.3.16` when running on Java 8. Remove the
hardcoded override in `google-cloud-storage` to keep default behavior on
Java 11+ at 1.5.33 while maintaining Java 8 test runtime compatibility.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
@lqiu96 lqiu96 force-pushed the migrate-awaitility-shared-deps branch from 7af17d4 to 432e1a8 Compare July 7, 2026 04:53
lqiu96 added 2 commits July 7, 2026 05:20
Move the `java8-logback` profile from `google-cloud-jar-parent` to
`java-storage/pom.xml` (Storage Parent) since Java 8 compatibility for
tests is primarily needed/used in the Storage module. Add explanatory
comments regarding Logback 1.5.x Java 11+ requirement and the need to
downgrade to 1.3.x for Java 8 runtimes.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
Revert all logback-related changes (alignment and Java 8 profile) from
this branch to keep it strictly focused on Awaitility migration. The
logback changes will be submitted in a separate PR.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
@lqiu96 lqiu96 marked this pull request as ready for review July 7, 2026 15:29
@lqiu96 lqiu96 requested review from a team as code owners July 7, 2026 15:29
@lqiu96 lqiu96 enabled auto-merge (squash) July 7, 2026 15:29
@lqiu96 lqiu96 disabled auto-merge July 7, 2026 16:32
@lqiu96 lqiu96 enabled auto-merge (squash) July 7, 2026 17:26
@lqiu96 lqiu96 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jul 7, 2026
@sonarqubecloud

sonarqubecloud Bot commented Jul 7, 2026

Copy link
Copy Markdown

@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jul 7, 2026
@sonarqubecloud

sonarqubecloud Bot commented Jul 7, 2026

Copy link
Copy Markdown

@lqiu96 lqiu96 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jul 8, 2026
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jul 8, 2026
@lqiu96 lqiu96 merged commit abb91ef into main Jul 8, 2026
305 of 321 checks passed
@lqiu96 lqiu96 deleted the migrate-awaitility-shared-deps branch July 8, 2026 02:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants