|
162 | 162 | <commons.collections.version>3.2.2</commons.collections.version> |
163 | 163 | <scala.version>2.12.10</scala.version> |
164 | 164 | <scala.binary.version>2.12</scala.binary.version> |
165 | | - <scalafmt.parameters>--diff --test</scalafmt.parameters> |
| 165 | + <scalafmt.parameters>--test</scalafmt.parameters> |
166 | 166 | <!-- for now, not running scalafmt as part of default verify pipeline --> |
167 | 167 | <scalafmt.skip>true</scalafmt.skip> |
168 | 168 | <codehaus.jackson.version>1.9.13</codehaus.jackson.version> |
|
2895 | 2895 | </execution> |
2896 | 2896 | </executions> |
2897 | 2897 | </plugin> |
| 2898 | + <plugin> |
| 2899 | + <groupId>org.antipathy</groupId> |
| 2900 | + <artifactId>mvn-scalafmt_${scala.binary.version}</artifactId> |
| 2901 | + <version>1.0.3</version> |
| 2902 | + <configuration> |
| 2903 | + <parameters>${scalafmt.parameters}</parameters> <!-- (Optional) Additional command line arguments --> |
| 2904 | + <skip>${scalafmt.skip}</skip> <!-- (Optional) skip formatting --> |
| 2905 | + <skipSources>${scalafmt.skip}</skipSources> |
| 2906 | + <skipTestSources>${scalafmt.skip}</skipTestSources> |
| 2907 | + <configLocation>dev/.scalafmt.conf</configLocation> <!-- (Optional) config location --> |
| 2908 | + <onlyChangedFiles>true</onlyChangedFiles> |
| 2909 | + </configuration> |
| 2910 | + <executions> |
| 2911 | + <execution> |
| 2912 | + <phase>validate</phase> |
| 2913 | + <goals> |
| 2914 | + <goal>format</goal> |
| 2915 | + </goals> |
| 2916 | + </execution> |
| 2917 | + </executions> |
| 2918 | + </plugin> |
2898 | 2919 | <!-- |
2899 | 2920 | Couple of dependencies are coming in bundle format (bundle is just a normal jar which |
2900 | 2921 | contains OSGi metadata in the manifest). If one don't use OSGi, then a bundle will work as |
|
3059 | 3080 | <build> |
3060 | 3081 | <pluginManagement> |
3061 | 3082 | <plugins> |
3062 | | - <!-- SPARK-29293 currently not able to update to 1.x for Scala 2.13 --> |
3063 | | - <plugin> |
3064 | | - <groupId>org.antipathy</groupId> |
3065 | | - <artifactId>mvn-scalafmt_2.12</artifactId> |
3066 | | - <version>0.12_1.5.1</version> |
3067 | | - <configuration> |
3068 | | - <parameters>${scalafmt.parameters}</parameters> <!-- (Optional) Additional command line arguments --> |
3069 | | - <skip>${scalafmt.skip}</skip> <!-- (Optional) skip formatting --> |
3070 | | - <skipSources>${scalafmt.skip}</skipSources> |
3071 | | - <skipTestSources>${scalafmt.skip}</skipTestSources> |
3072 | | - <configLocation>dev/.scalafmt.conf</configLocation> <!-- (Optional) config location --> |
3073 | | - </configuration> |
3074 | | - <executions> |
3075 | | - <execution> |
3076 | | - <phase>validate</phase> |
3077 | | - <goals> |
3078 | | - <goal>format</goal> |
3079 | | - </goals> |
3080 | | - </execution> |
3081 | | - </executions> |
3082 | | - </plugin> |
3083 | 3083 | </plugins> |
3084 | 3084 | </pluginManagement> |
3085 | 3085 | </build> |
|
0 commit comments