From e226ca1245603e8ba8b3f1293899ff9066c78e34 Mon Sep 17 00:00:00 2001
From: Dan Sanduleac <dsanduleac@palantir.com>
Date: Wed, 11 Sep 2019 12:03:35 -0400
Subject: [PATCH 1/2] fix multicatch alignment to not start with newline

---
 gradle-baseline-java-config/resources/spotless/eclipse.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-baseline-java-config/resources/spotless/eclipse.xml b/gradle-baseline-java-config/resources/spotless/eclipse.xml
index 2ca226cf6..cff10b095 100644
--- a/gradle-baseline-java-config/resources/spotless/eclipse.xml
+++ b/gradle-baseline-java-config/resources/spotless/eclipse.xml
@@ -86,7 +86,7 @@
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="80"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>

From 744a95104181f8934bbbc05be9d328b02443dc4f Mon Sep 17 00:00:00 2001
From: Dan Sanduleac <dsanduleac@palantir.com>
Date: Wed, 11 Sep 2019 16:03:35 +0000
Subject: [PATCH 2/2] Add generated changelog entries

---
 changelog/@unreleased/pr-807.v2.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelog/@unreleased/pr-807.v2.yml

diff --git a/changelog/@unreleased/pr-807.v2.yml b/changelog/@unreleased/pr-807.v2.yml
new file mode 100644
index 000000000..efe42e336
--- /dev/null
+++ b/changelog/@unreleased/pr-807.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Eclipse formatter now aligns multicatch so that it passes checkstyle.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/807