From 4e775b1ce9572c40f4960fcf0560ec736c348f55 Mon Sep 17 00:00:00 2001
From: cody koeninger <cody@koeninger.org>
Date: Sun, 19 Jan 2020 12:27:01 -0600
Subject: [PATCH] SPARK-30570 scalafmt 1.0.3 onlyChangedFiles appears to work
 correctly on scala 2.12

---
 dev/scalafmt | 5 +----
 pom.xml      | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev/scalafmt b/dev/scalafmt
index 0541a4058467b..7471d90bbd65c 100755
--- a/dev/scalafmt
+++ b/dev/scalafmt
@@ -17,7 +17,4 @@
 # limitations under the License.
 #
 
-# by default, format only files that differ from git master
-params="${@:---diff}"
-
-./build/mvn -Pscala-2.12 mvn-scalafmt_2.12:format -Dscalafmt.skip=false -Dscalafmt.parameters="$params"
\ No newline at end of file
+./build/mvn -Pscala-2.12 mvn-scalafmt_2.12:format -Dscalafmt.skip=false
diff --git a/pom.xml b/pom.xml
index ef8fb709bbb59..746a8b1fcd3c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
     <commons.collections.version>3.2.2</commons.collections.version>
     <scala.version>2.12.10</scala.version>
     <scala.binary.version>2.12</scala.binary.version>
-    <scalafmt.parameters>--diff --test</scalafmt.parameters>
+    <scalafmt.parameters>--test</scalafmt.parameters>
     <!-- for now, not running scalafmt as part of default verify pipeline -->
     <scalafmt.skip>true</scalafmt.skip>
     <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
@@ -3047,13 +3047,14 @@
             <plugin>
               <groupId>org.antipathy</groupId>
               <artifactId>mvn-scalafmt_2.12</artifactId>
-              <version>0.12_1.5.1</version>
+              <version>1.0.3</version>
               <configuration>
                 <parameters>${scalafmt.parameters}</parameters> <!-- (Optional) Additional command line arguments -->
                 <skip>${scalafmt.skip}</skip> <!-- (Optional) skip formatting -->
                 <skipSources>${scalafmt.skip}</skipSources>
                 <skipTestSources>${scalafmt.skip}</skipTestSources>
                 <configLocation>dev/.scalafmt.conf</configLocation> <!-- (Optional) config location -->
+                <onlyChangedFiles>true</onlyChangedFiles>
               </configuration>
               <executions>
                 <execution>