Upgrade formatter / impsort plugins

apache · Apr 28, 2021 · 3af0884 · 3af0884
1 parent bbbd3a0
commit 3af0884
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/build/eclipse-formatter-config.xml b/build/eclipse-formatter-config.xml
@@ -89,7 +89,13 @@
         <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>

diff --git a/pom.xml b/pom.xml
@@ -52,9 +52,9 @@
         <!-- plugin versions a..z -->
         <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
         <compiler.version>3.8.1</compiler.version>
-        <formatter-maven-plugin.version>2.12.1</formatter-maven-plugin.version>
+        <formatter-maven-plugin.version>2.15.0</formatter-maven-plugin.version>
         <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
-        <impsort-maven-plugin.version>1.4.1</impsort-maven-plugin.version>
+        <impsort-maven-plugin.version>1.6.0</impsort-maven-plugin.version>
         <license-maven-plugin.version>3.0</license-maven-plugin.version>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <maven-install-plugin.version>2.4</maven-install-plugin.version>
@@ -334,6 +334,7 @@ limitations under the License.</inlineHeader>
                         <configFile>${maven.multiModuleProjectDirectory}/build/eclipse-formatter-config.xml</configFile>
                         <skip>${format.skip}</skip>
                         <lineEnding>KEEP</lineEnding>
+                        <cachedir>${build.directory}/cache</cachedir>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -345,6 +346,7 @@ limitations under the License.</inlineHeader>
                         <staticAfter>true</staticAfter>
                         <lineEnding>KEEP</lineEnding>
                         <skip>${format.skip}</skip>
+                        <cachedir>${build.directory}/cache</cachedir>
                     </configuration>
                 </plugin>
                 <plugin>