-
Notifications
You must be signed in to change notification settings - Fork 13.6k
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
MINOR: Ensure a single version of scala-library is used #9155
Conversation
In 2.4 we use |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks.
ok to test |
2 builds passed, 1 flaky test failure for Java 8. |
This patch ensures we use a force resolution strategy for the scala-library dependency. I've tested this locally and saw a difference in the output. With the change (using 2.4 and the jackson library 2.10.5): ``` ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.10.jar ``` Without (using 2.4 and the jackson library 2.10.5): ``` find . -name 'scala*.jar' ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.12.jar ``` Reviewers: Ismael Juma <ismael@juma.me.uk>
This patch ensures we use a force resolution strategy for the scala-library dependency. I've tested this locally and saw a difference in the output. With the change (using 2.4 and the jackson library 2.10.5): ``` ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.10.jar ``` Without (using 2.4 and the jackson library 2.10.5): ``` find . -name 'scala*.jar' ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.12.jar ``` Reviewers: Ismael Juma <ismael@juma.me.uk>
This patch ensures we use a force resolution strategy for the scala-library dependency. I've tested this locally and saw a difference in the output. With the change (using 2.4 and the jackson library 2.10.5): ``` ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.10.jar ``` Without (using 2.4 and the jackson library 2.10.5): ``` find . -name 'scala*.jar' ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.12.jar ``` Reviewers: Ismael Juma <ismael@juma.me.uk>
Merged to master and cherry-picked to 2.6, 2.5 and 2.4 branches. |
I just updated the PR description to mention that both tests were using Jackson |
I fixed the commit message too before merging, so no worries. :) |
This patch ensures we use a force resolution strategy for the scala-library dependency. I've tested this locally and saw a difference in the output. With the change (using 2.4 and the jackson library 2.10.5): ``` ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.10.jar ``` Without (using 2.4 and the jackson library 2.10.5): ``` find . -name 'scala*.jar' ./core/build/dependant-libs-2.12.10/scala-java8-compat_2.12-0.9.0.jar ./core/build/dependant-libs-2.12.10/scala-collection-compat_2.12-2.1.2.jar ./core/build/dependant-libs-2.12.10/scala-reflect-2.12.10.jar ./core/build/dependant-libs-2.12.10/scala-logging_2.12-3.9.2.jar ./core/build/dependant-libs-2.12.10/scala-library-2.12.12.jar ``` Reviewers: Ismael Juma <ismael@juma.me.uk>
This patch ensures we use a force resolution strategy for the scala-library dependency
I've tested this locally and saw a difference in the output:
With the change (using 2.4 and the jackson library 2.10.5):
Without (using 2.4 and the jackson library 2.10.5):