From de3e1a0d0d6c85cb89ce66c08a476048f003c9d1 Mon Sep 17 00:00:00 2001
From: Paul Grey <pgrey@cloudera.com>
Date: Tue, 13 Apr 2021 11:42:48 -0400
Subject: [PATCH] NIFI-8416 - Removed dl.bintray.com repository for Groovy

- Upgraded Groovy from 2.5.4 to 2.5.6
- Unit test updates correcting issues with Groovy/Spock and Java 11

This closes #4999

Signed-off-by: David Handermann <exceptionfactory@apache.org>
---
 .../toolkit/admin/client/NiFiClientUtilSpec.groovy  |  4 ++--
 .../admin/configmigrator/ConfigMigratorSpec.groovy  |  4 ++--
 .../admin/filemanager/FileManagerToolSpec.groovy    |  4 ++--
 .../admin/nodemanager/NodeManagerToolSpec.groovy    |  4 ++--
 .../admin/notify/NotificationToolSpec.groovy        |  4 ++--
 pom.xml                                             | 13 +------------
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy
index 0b00c08a4e..ed65845efa 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy
@@ -31,10 +31,10 @@ import javax.ws.rs.core.Response
 class NiFiClientUtilSpec extends Specification{
 
     @Rule
-    public final ExpectedSystemExit exit = ExpectedSystemExit.none()
+    public ExpectedSystemExit exit = ExpectedSystemExit.none()
 
     @Rule
-    public final SystemOutRule systemOutRule = new SystemOutRule().enableLog()
+    public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
 
     def "build unsecure url successfully"(){
 
diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/configmigrator/ConfigMigratorSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/configmigrator/ConfigMigratorSpec.groovy
index 54b6199e0a..f8baee154d 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/configmigrator/ConfigMigratorSpec.groovy
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/configmigrator/ConfigMigratorSpec.groovy
@@ -32,10 +32,10 @@ import java.nio.file.attribute.PosixFilePermission
 class ConfigMigratorSpec extends Specification{
 
     @Rule
-    public final ExpectedSystemExit exit = ExpectedSystemExit.none()
+    public ExpectedSystemExit exit = ExpectedSystemExit.none()
 
     @Rule
-    public final SystemOutRule systemOutRule = new SystemOutRule().enableLog()
+    public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
 
     @BeforeClass
     static void setUpOnce() throws Exception {
diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/filemanager/FileManagerToolSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/filemanager/FileManagerToolSpec.groovy
index 959fa560a2..2611a34212 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/filemanager/FileManagerToolSpec.groovy
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/filemanager/FileManagerToolSpec.groovy
@@ -31,10 +31,10 @@ import java.nio.file.attribute.PosixFilePermission
 
 class FileManagerToolSpec extends Specification{
     @Rule
-    public final ExpectedSystemExit exit = ExpectedSystemExit.none()
+    public ExpectedSystemExit exit = ExpectedSystemExit.none()
 
     @Rule
-    public final SystemOutRule systemOutRule = new SystemOutRule().enableLog()
+    public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
 
     @BeforeClass
     static void setUpOnce() throws Exception {
diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy
index b68e1a66ac..b1ac4fe97d 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy
@@ -36,10 +36,10 @@ import javax.ws.rs.core.Response
 class NodeManagerToolSpec extends Specification{
 
     @Rule
-    public final ExpectedSystemExit exit = ExpectedSystemExit.none()
+    public ExpectedSystemExit exit = ExpectedSystemExit.none()
 
     @Rule
-    public final SystemOutRule systemOutRule = new SystemOutRule().enableLog()
+    public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
 
 
     def "print help and usage info"() {
diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy
index cd2da87470..ebb092045a 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy
@@ -37,10 +37,10 @@ import java.nio.file.attribute.PosixFilePermission
 class NotificationToolSpec extends Specification{
 
     @Rule
-    public final ExpectedSystemExit exit = ExpectedSystemExit.none()
+    public ExpectedSystemExit exit = ExpectedSystemExit.none()
 
     @Rule
-    public final SystemOutRule systemOutRule = new SystemOutRule().enableLog()
+    public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
 
 
     def "print help and usage info"() {
diff --git a/pom.xml b/pom.xml
index 3e24d944eb..7706c5fe2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
         <jetty.version>9.4.38.v20210224</jetty.version>
         <jackson.version>2.12.2</jackson.version>
         <nifi.registry.version>0.8.0</nifi.registry.version>
-        <nifi.groovy.version>2.5.4</nifi.groovy.version>
+        <nifi.groovy.version>2.5.6</nifi.groovy.version>
         <surefire.version>2.22.2</surefire.version>
         <!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs that depend on it, other NARs that need
             a specific version should override this property, or use a more specific property like abc.hadoop.version -->
@@ -176,17 +176,6 @@
                 <updatePolicy>never</updatePolicy>
             </releases>
         </pluginRepository>
-        <pluginRepository>
-            <id>bintray</id>
-            <name>Groovy Bintray</name>
-            <url>https://dl.bintray.com/groovy/maven</url>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
     </pluginRepositories>
 
     <dependencyManagement>