From 9b79ef5a2cd3c7797b4fa611899c6dc3d9b43549 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 28 Apr 2018 14:25:31 +0200
Subject: [PATCH] Do not run checkstyle as part of the gradle check task
 (#3985)

* Do not run checkstyle as part of the gradle check task

* Run main build before checkstyle
---
 .travis.yml  | 2 +-
 build.gradle | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e981c01a6db..6c3e1ae91df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ env:
   global:
     - GRADLE_OPTS=-Dorg.gradle.daemon=false
   matrix:
-    - TEST_SUITE=checkstyle
     - TEST_SUITE=check OPTIONS=modernizer
+    - TEST_SUITE=checkstyle
     - TEST_SUITE=fetcherTest
     - TEST_SUITE=databaseTest
     - TEST_SUITE=guiTest
diff --git a/build.gradle b/build.gradle
index 8bd2ed9e9f5..cfdcb23314c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -395,11 +395,11 @@ checkstyle {
     // do not use other packages for checkstyle, excluding gen(erated) sources
     checkstyleMain.source = "src/main/java"
     toolVersion = '8.5'
+    
+    // do not perform checkstyle checks by default
+    sourceSets = []
 }
 
-checkstyleMain.shouldRunAfter test
-checkstyleTest.shouldRunAfter test
-
 modernizer {
     // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output.
     // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer