[MSHADE-368] - Preserve one-sided Groovy extensions - #832
Open
wilx wants to merge 2 commits into
Open
Conversation
Reproduce shading an extension module that only declares instance extension classes. Verify that the transformed descriptor and its extension class survive in the shaded JAR.
Write the aggregated descriptor when either instance or static extension classes were collected. Groovy extension modules do not need to declare both kinds. Fixes apache#572.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #572.
Summary
Preserve Groovy extension-module descriptors that declare only instance
extension classes or only static extension classes.
Groovy permits either extension category to be empty. The
GroovyResourceTransformerpreviously reported a transformed resource onlywhen both categories were populated. Shade had already consumed the original
descriptor by that point, so it wrote neither the original descriptor nor an
aggregated replacement.
The transformer now reports output when either category contains extension
classes. A new MSHADE-368 integration test shades the real
groovy-sql:3.0.0artifact and verifies that its instance-only extensiondescriptor and implementation class survive in the shaded JAR.
Tests
mvn -Prun-its clean verifyFollowing this checklist to help us incorporate your
contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
[MSHADE-XXX] - Fixes bug in ApproximateQuantiles,where you replace
MSHADE-XXXwith the appropriate JIRA issue. Best practiceis to use the JIRA issue title in the pull request title and in the first line of the
commit message.
mvn clean verifyto make sure basic checks pass. A more thorough check willbe performed on your pull request automatically.
mvn -Prun-its clean verify).If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.