From 933c22dce641bc1297ae373d8ec1204c405f117c Mon Sep 17 00:00:00 2001
From: David Turner <david.turner@elastic.co>
Date: Fri, 24 Nov 2017 08:13:13 +0000
Subject: [PATCH] Tidy up after elastic/x-pack-elasticsearch#3078
 (elastic/x-pack-elasticsearch#3099)

Original commit: elastic/x-pack-elasticsearch@ebe599a422268110b5c4f0619f23f0bc2e8651dd
---
 build.gradle                         | 1 -
 qa/full-cluster-restart/build.gradle | 6 ++----
 qa/rolling-upgrade/build.gradle      | 6 ++----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index cc9e98be129..4c87c23ad65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ import org.elasticsearch.gradle.BuildPlugin
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.precommit.LicenseHeadersTask
-import sun.reflect.generics.reflectiveObjects.NotImplementedException
 
 if (project.projectDir.name != 'x-pack-elasticsearch') {
   throw new GradleException('You must checkout x-pack-elasticsearch in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack-elasticsearch')
diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle
index 9648a7b2590..4235a926d12 100644
--- a/qa/full-cluster-restart/build.gradle
+++ b/qa/full-cluster-restart/build.gradle
@@ -227,10 +227,8 @@ subprojects {
   // basic integ tests includes testing bwc against the most recent version
   task integTest {
     if (project.bwc_tests_enabled) {
-      if (project.bwc_tests_enabled) {
-        for (final def version : versionCollection.basicIntegrationTestVersions) {
-          dependsOn "v${version}#bwcTest"
-        }
+      for (final def version : versionCollection.basicIntegrationTestVersions) {
+        dependsOn "v${version}#bwcTest"
       }
     }
   }
diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
index ebac7e6e877..3c3ead28a0c 100644
--- a/qa/rolling-upgrade/build.gradle
+++ b/qa/rolling-upgrade/build.gradle
@@ -256,10 +256,8 @@ subprojects {
   // basic integ tests includes testing bwc against the most recent version
   task integTest {
     if (project.bwc_tests_enabled) {
-      if (project.bwc_tests_enabled) {
-        for (final def version : versionCollection.basicIntegrationTestVersions) {
-          dependsOn "v${version}#bwcTest"
-        }
+      for (final def version : versionCollection.basicIntegrationTestVersions) {
+        dependsOn "v${version}#bwcTest"
       }
     }
   }