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.

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

Fix JVM resource classification and artifact grouping (Cherry-pick of #15567) #15573

Merged
merged 1 commit into from
May 22, 2022

Conversation

stuhood
Copy link
Member

@stuhood stuhood commented May 20, 2022

#15457 introduced a code generator to generate resources from resources, and that broke the classification of resources for the JVM, because the JvmResourcesRequest matched twice.

Additionally, the generator-awareness of resources processing was not working (depending on a resources generator should bring in a single jar containing the entire set of files, while depending on a single resource target should expose only that file) due to an inverted condition.

Add an integration test to cover both cases.

pantsbuild#15457 introduced a code generator to generate `resources` from `resources`, and that broke the classification of `resources` for the JVM, because the `JvmResourcesRequest` matched twice.

Additionally, the generator-awareness of `resources` processing was not working (depending on a `resources` generator should bring in a single jar containing the entire set of files, while depending on a single `resource` target should expose only that file) due to an inverted condition.

Add an integration test to cover both cases.
# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
@stuhood stuhood added the category:bugfix Bug fixes for released features label May 20, 2022
@stuhood stuhood requested review from tdyas and Eric-Arellano May 20, 2022 23:11
@stuhood stuhood merged commit 8be9f12 into pantsbuild:2.12.x May 22, 2022
@stuhood stuhood deleted the cherry-pick-15567-to-2.12.x branch May 22, 2022 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:bugfix Bug fixes for released features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants