[SPARK-34774][BUILD][2.4] Ensure change-scala-version.sh update scala.version in parent POM correctly#31893
Closed
LuciferYang wants to merge 1 commit into
Closed
[SPARK-34774][BUILD][2.4] Ensure change-scala-version.sh update scala.version in parent POM correctly#31893LuciferYang wants to merge 1 commit into
LuciferYang wants to merge 1 commit into
Conversation
|
Refer to this link for build results (access rights to CI server needed): |
|
Refer to this link for build results (access rights to CI server needed): |
Member
|
cc @srowen |
Member
|
Also, cc @viirya since he is the release manager for 2.4.8. |
srowen
approved these changes
Mar 19, 2021
viirya
approved these changes
Mar 19, 2021
dongjoon-hyun
approved these changes
Mar 19, 2021
Member
|
Merged to 2.4 |
srowen
pushed a commit
that referenced
this pull request
Mar 19, 2021
….version in parent POM correctly ### What changes were proposed in this pull request? After SPARK-34507, execute` change-scala-version.sh` script will update `scala.version` in parent pom, but if we execute the following commands in order： ``` dev/change-scala-version.sh 2.12 dev/change-scala-version.sh 2.11 git status ``` there will generate git diff as follow: ``` diff --git a/pom.xml b/pom.xml index f4a50dc..89fd7d88af 100644 --- a/pom.xml +++ b/pom.xml -155,7 +155,7 <commons.math3.version>3.4.1</commons.math3.version> <commons.collections.version>3.2.2</commons.collections.version> - <scala.version>2.11.12</scala.version> + <scala.version>2.12.10</scala.version> <scala.binary.version>2.11</scala.binary.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <fasterxml.jackson.version>2.6.7</fasterxml.jackson.version> ``` seem 'scala.version' property was not update correctly. So this pr add an extra 'scala.version' to scala-2.11 profile to ensure change-scala-version.sh can update the public `scala.version` property correctly. ### Why are the changes needed? Bug fix. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? **Manual test** Execute the following commands in order： ``` dev/change-scala-version.sh 2.12 dev/change-scala-version.sh 2.11 git status ``` **Before** ``` diff --git a/pom.xml b/pom.xml index f4a50dc..89fd7d88af 100644 --- a/pom.xml +++ b/pom.xml -155,7 +155,7 <commons.math3.version>3.4.1</commons.math3.version> <commons.collections.version>3.2.2</commons.collections.version> - <scala.version>2.11.12</scala.version> + <scala.version>2.12.10</scala.version> <scala.binary.version>2.11</scala.binary.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <fasterxml.jackson.version>2.6.7</fasterxml.jackson.version> ``` **After** No git diff. Closes #31893 from LuciferYang/SPARK-34774-24. Authored-by: yangjie01 <yangjie01@baidu.com> Signed-off-by: Sean Owen <srowen@gmail.com>
Contributor
Author
|
thx all ~ |
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
5 participants
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.
What changes were proposed in this pull request?
After SPARK-34507, execute
change-scala-version.shscript will updatescala.versionin parent pom, but if we execute the following commands in order：there will generate git diff as follow:
seem 'scala.version' property was not update correctly.
So this pr add an extra 'scala.version' to scala-2.11 profile to ensure change-scala-version.sh can update the public
scala.versionproperty correctly.Why are the changes needed?
Bug fix.
Does this PR introduce any user-facing change?
No
How was this patch tested?
Manual test
Execute the following commands in order：
Before
After
No git diff.