From fb17df04f20a728d4ab95e2c0c88b53ec439b578 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Wed, 18 Sep 2019 13:38:31 -0700
Subject: [PATCH 1/2] Allow static imports of AssertJ and Mockito

---
 .../resources/checkstyle/checkstyle.xml                   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
index f541b63e2..43ec38a3a 100644
--- a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
+++ b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
@@ -84,11 +84,13 @@
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
             <property name="excludes" value="
+                com.google.common.base.Preconditions.*,
+                com.palantir.logsafe.Preconditions.*,
                 java.util.Collections.*,
                 java.util.stream.Collectors.*,
-                com.palantir.logsafe.Preconditions.*,
-                com.google.common.base.Preconditions.*,
-                org.apache.commons.lang3.Validate.*"/>
+                org.apache.commons.lang3.Validate.*,
+                org.assertj.core.api.Assertions.*,
+                org.mockito.Mockito.*"/>
         </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>

From e45994e1e67ff92922a0d04d29f270d1ff3e3c61 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Wed, 18 Sep 2019 20:38:31 +0000
Subject: [PATCH 2/2] Add generated changelog entries

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

diff --git a/changelog/@unreleased/pr-915.v2.yml b/changelog/@unreleased/pr-915.v2.yml
new file mode 100644
index 000000000..289ef6c1b
--- /dev/null
+++ b/changelog/@unreleased/pr-915.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Baseline now allows static imports of AssertJ and Mockito methods.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/915