LuciferYang opened a new pull request #31865:
URL: https://github.com/apache/spark/pull/31865


   ### 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.13
   dev/change-scala-version.sh 2.12
   git status
   ```
   
   there will generate git diff as follow:
   
   ```
   diff --git a/pom.xml b/pom.xml
   index ddc4ce2f68..f43d8c8f78 100644
   --- a/pom.xml
   +++ b/pom.xml
   @@ -162,7 +162,7 @@
        <commons.math3.version>3.4.1</commons.math3.version>
        <!-- managed up from 3.2.1 for SPARK-11652 -->
        <commons.collections.version>3.2.2</commons.collections.version>
   -    <scala.version>2.12.10</scala.version>
   +    <scala.version>2.13.5</scala.version>
        <scala.binary.version>2.12</scala.binary.version>
        <scalatest-maven-plugin.version>2.0.0</scalatest-maven-plugin.version>
        <scalafmt.parameters>--test</scalafmt.parameters>
   ```
   
   seem 'scala.version' property was not update correctly.
   
   So this pr add an extra 'scala.version' to scala-2.12 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.13
   dev/change-scala-version.sh 2.12
   git status
   ```
   
   **Before**
   
   ```
   diff --git a/pom.xml b/pom.xml
   index ddc4ce2f68..f43d8c8f78 100644
   --- a/pom.xml
   +++ b/pom.xml
   @@ -162,7 +162,7 @@
        <commons.math3.version>3.4.1</commons.math3.version>
        <!-- managed up from 3.2.1 for SPARK-11652 -->
        <commons.collections.version>3.2.2</commons.collections.version>
   -    <scala.version>2.12.10</scala.version>
   +    <scala.version>2.13.5</scala.version>
        <scala.binary.version>2.12</scala.binary.version>
        <scalatest-maven-plugin.version>2.0.0</scalatest-maven-plugin.version>
        <scalafmt.parameters>--test</scalafmt.parameters>
   ```
   
   **After**
   
   No git diff. 


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to