You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2021/04/13 17:23:52 UTC
[nifi] branch main updated: NIFI-8416 - Removed dl.bintray.com
repository for Groovy
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new de3e1a0 NIFI-8416 - Removed dl.bintray.com repository for Groovy
de3e1a0 is described below
commit de3e1a0d0d6c85cb89ce66c08a476048f003c9d1
Author: Paul Grey <pg...@cloudera.com>
AuthorDate: Tue Apr 13 11:42:48 2021 -0400
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 <ex...@apache.org>
---
.../nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy | 4 ++--
.../toolkit/admin/configmigrator/ConfigMigratorSpec.groovy | 4 ++--
.../toolkit/admin/filemanager/FileManagerToolSpec.groovy | 4 ++--
.../toolkit/admin/nodemanager/NodeManagerToolSpec.groovy | 4 ++--
.../nifi/toolkit/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 0b00c08..ed65845 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 54b6199..f8baee1 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 959fa56..2611a34 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 b68e1a6..b1ac4fe 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 cd2da87..ebb0920 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 3e24d94..7706c5f 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>