From 8fa3594565d43c81d5e1a34660b29a861b81d43a Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@gmail.com>
Date: Fri, 24 Jan 2020 16:49:14 +0900
Subject: [PATCH] Remove Error-Prone ExpectedExceptionChecker

The checker only checks for misuse of ExpectedException. Since we've
moved to JUnit 4.13 and assertThrows, ExpectedException won't be used
at all, so now we can get rid of that setting.

Change-Id: Ia9189936ae215110f1f5fc6459c5dbc944404ade
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
---
 org.eclipse.jgit.benchmarks/pom.xml | 3 ---
 pom.xml                             | 3 ---
 tools/BUILD                         | 1 -
 3 files changed, 7 deletions(-)

diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index 426fb7ffe..5e707719e 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -69,9 +69,6 @@
             <configuration>
               <compilerId>javac-with-errorprone</compilerId>
               <forceJavacCompilerUse>true</forceJavacCompilerUse>
-              <compilerArgs>
-                <arg>-Xep:ExpectedExceptionChecker:ERROR</arg>
-              </compilerArgs>
             </configuration>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index 0e1e98fa6..06e2f308a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -836,9 +836,6 @@
                 <configuration>
                   <compilerId>javac-with-errorprone</compilerId>
                   <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                  <compilerArgs>
-                    <arg>-Xep:ExpectedExceptionChecker:ERROR</arg>
-                  </compilerArgs>
                   <excludes>
                     <exclude>org/eclipse/jgit/transport/InsecureCipherFactory.java</exclude>
                   </excludes>
diff --git a/tools/BUILD b/tools/BUILD
index e5931dc8c..d66837700 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -39,7 +39,6 @@ java_package_configuration(
         "-Xep:ElementsCountedInLoop:ERROR",
         "-Xep:EqualsHashCode:ERROR",
         "-Xep:EqualsIncompatibleType:ERROR",
-        "-Xep:ExpectedExceptionChecker:ERROR",
         "-Xep:Finally:WARN",
         "-Xep:FloatingPointLiteralPrecision:ERROR",
         "-Xep:FragmentInjection:ERROR",