Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix storage downstream check to use sdk-platform-java-config artifact #759

Merged
merged 6 commits into from
Feb 23, 2024
Merged

chore: fix storage downstream check to use sdk-platform-java-config artifact #759

merged 6 commits into from
Feb 23, 2024

Conversation

mpeddada1
Copy link
Contributor

Fixes #748

@mpeddada1 mpeddada1 requested a review from a team as a code owner February 22, 2024 15:41
@product-auto-label product-auto-label bot added the size: xs Pull request size is extra small. label Feb 22, 2024
@mpeddada1
Copy link
Contributor Author

mpeddada1 commented Feb 22, 2024 •
edited
Loading

downstream/ flatten-pluggin-check running into:

Error: ] Some problems were encountered while processing the POMs:
[FATAL] Non-readable POM /home/runner/work/java-shared-config/java-shared-config/sdk-platform-java/java-storage/pom.xml: no more data available START_DOCUMENT seen <?xml version="1.0" encoding="UTF-8"?>\n... @2:1 @ 
 @ 
Error:  The build could not read 1 project -> [Help 1]

Verifying locally.

[UPDATE] Running mvn install -B -V -ntp -DskipTests=true -Dclirr.skip=true -Denforcer.skip=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -T 1C locally in sdk-platform-java/java-storage results in a successful build:

[INFO] --- maven-install-plugin:2.4:install (default-install) @ google-cloud-storage-control ---
[INFO] Installing /usr/local/google/home/mpeddada/IdeaProjects/java-shared-config/sdk-platform-java/java-storage/google-cloud-storage-control/target/google-cloud-storage-control-2.34.1-alpha-SNAPSHOT.jar to /usr/local/google/home/mpeddada/.m2/repository/com/google/cloud/google-cloud-storage-control/2.34.1-alpha-SNAPSHOT/google-cloud-storage-control-2.34.1-alpha-SNAPSHOT.jar
[INFO] Installing /usr/local/google/home/mpeddada/IdeaProjects/java-shared-config/sdk-platform-java/java-storage/google-cloud-storage-control/pom.xml to /usr/local/google/home/mpeddada/.m2/repository/com/google/cloud/google-cloud-storage-control/2.34.1-alpha-SNAPSHOT/google-cloud-storage-control-2.34.1-alpha-SNAPSHOT.pom
[INFO] Installing /usr/local/google/home/mpeddada/IdeaProjects/java-shared-config/sdk-platform-java/java-storage/google-cloud-storage-control/target/google-cloud-storage-control-2.34.1-alpha-SNAPSHOT-tests.jar to /usr/local/google/home/mpeddada/.m2/repository/com/google/cloud/google-cloud-storage-control/2.34.1-alpha-SNAPSHOT/google-cloud-storage-control-2.34.1-alpha-SNAPSHOT-tests.jar
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] 
[INFO] Storage Parent 2.34.1-SNAPSHOT ..................... SUCCESS [  2.329 s]
[INFO] proto-google-cloud-storage-v2 2.34.1-alpha-SNAPSHOT  SUCCESS [ 18.569 s]
[INFO] grpc-google-cloud-storage-v2 2.34.1-alpha-SNAPSHOT . SUCCESS [  2.355 s]
[INFO] gapic-google-cloud-storage-v2 2.34.1-alpha-SNAPSHOT  SUCCESS [  8.834 s]
[INFO] Google Cloud Storage 2.34.1-SNAPSHOT ............... SUCCESS [02:11 min]
[INFO] proto-google-cloud-storage-control-v2 2.34.1-alpha-SNAPSHOT SUCCESS [  5.382 s]
[INFO] grpc-google-cloud-storage-control-v2 2.34.1-alpha-SNAPSHOT SUCCESS [  2.809 s]
[INFO] google-cloud-storage-control 2.34.1-alpha-SNAPSHOT . SUCCESS [  4.597 s]
[INFO] Google Cloud Storage BOM 2.34.1-SNAPSHOT ........... SUCCESS [  2.329 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  02:48 min (Wall Clock)
[INFO] Finished at: 2024-02-22T16:38:58Z

@product-auto-label product-auto-label bot added size: s Pull request size is small. and removed size: xs Pull request size is extra small. labels Feb 22, 2024
@mpeddada1
Copy link
Contributor Author

mpeddada1 commented Feb 22, 2024 •
edited
Loading

Running mvn help:effective-pom just after replacing the sdk-platform-java-config is results in the same error as #759 (comment).

Able to reproduce this error locally with REPO_TAG=v2.9.3 ./.kokoro/client-library-check.sh java-storage flatten-plugin. Replacing the version doesn't work on this branch because v2.9.3 still uses java-shared-config.

@product-auto-label product-auto-label bot added size: xs Pull request size is extra small. and removed size: s Pull request size is small. labels Feb 22, 2024
@mpeddada1
Copy link
Contributor Author

Thanks for taking a look @burkedavison! Re-requesting a review since the state of the PR has changed since the last review

mpeddada1
mpeddada1 commented Feb 22, 2024
View reviewed changes
.kokoro/client-library-check.sh
if [ "$REPO" == "java-storage" ]; then
# If using an older version of java-storage, continue replacing java-shared-config version otherwise replace
# the version of sdk-platform-java-config.
if [ "${REPO_TAG}" == "v2.9.3" ] && [ "${REPO}" == "java-storage" ]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This condition is needed until we can upgrade the flatten-plugin check to use at least v2.35.0 of java-storage which inherits sdk-platform-java-config instead of java-shared-config.

@mpeddada1 mpeddada1 merged commit 927909b into main Feb 23, 2024
48 checks passed
@mpeddada1 mpeddada1 deleted the fix-storage-dw branch February 23, 2024 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@burkedavison burkedavison burkedavison approved these changes

Assignees
No one assigned
Labels
size: xs Pull request size is extra small.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update downstream checks after handwritten lib migration to sdk-platform-java-config.
2 participants
@mpeddada1 @burkedavison