Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-06 01:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-8416 - Removed dl.bintray.com repository for Groovy

Browse Source 
- 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>
This commit is contained in:
Paul Grey 2021-04-13 11:42:48 -04:00 committed by exceptionfactory
parent 7d5903c323
commit de3e1a0d0d
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
6 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy
View File

@ -31,10 +31,10 @@ import javax.ws.rs.core.Response
class NiFiClientUtilSpec extends Specification{ class NiFiClientUtilSpec extends Specification{
@Rule @Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none() public ExpectedSystemExit exit = ExpectedSystemExit.none()
@Rule @Rule
public final SystemOutRule systemOutRule = new SystemOutRule().enableLog() public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
def "build unsecure url successfully"(){ def "build unsecure url successfully"(){

4
nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/configmigrator/ConfigMigratorSpec.groovy
View File

@ -32,10 +32,10 @@ import java.nio.file.attribute.PosixFilePermission
class ConfigMigratorSpec extends Specification{ class ConfigMigratorSpec extends Specification{
@Rule @Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none() public ExpectedSystemExit exit = ExpectedSystemExit.none()
@Rule @Rule
public final SystemOutRule systemOutRule = new SystemOutRule().enableLog() public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
@BeforeClass @BeforeClass
static void setUpOnce() throws Exception { static void setUpOnce() throws Exception {

4
nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/filemanager/FileManagerToolSpec.groovy
View File

@ -31,10 +31,10 @@ import java.nio.file.attribute.PosixFilePermission
class FileManagerToolSpec extends Specification{ class FileManagerToolSpec extends Specification{
@Rule @Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none() public ExpectedSystemExit exit = ExpectedSystemExit.none()
@Rule @Rule
public final SystemOutRule systemOutRule = new SystemOutRule().enableLog() public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
@BeforeClass @BeforeClass
static void setUpOnce() throws Exception { static void setUpOnce() throws Exception {

4
nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy
View File

@ -36,10 +36,10 @@ import javax.ws.rs.core.Response
class NodeManagerToolSpec extends Specification{ class NodeManagerToolSpec extends Specification{
@Rule @Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none() public ExpectedSystemExit exit = ExpectedSystemExit.none()
@Rule @Rule
public final SystemOutRule systemOutRule = new SystemOutRule().enableLog() public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
def "print help and usage info"() { def "print help and usage info"() {

4
nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy
View File

@ -37,10 +37,10 @@ import java.nio.file.attribute.PosixFilePermission
class NotificationToolSpec extends Specification{ class NotificationToolSpec extends Specification{
@Rule @Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none() public ExpectedSystemExit exit = ExpectedSystemExit.none()
@Rule @Rule
public final SystemOutRule systemOutRule = new SystemOutRule().enableLog() public SystemOutRule systemOutRule = new SystemOutRule().enableLog()
def "print help and usage info"() { def "print help and usage info"() {

13
pom.xml
View File

@ -95,7 +95,7 @@
<jetty.version>9.4.38.v20210224</jetty.version> <jetty.version>9.4.38.v20210224</jetty.version>
<jackson.version>2.12.2</jackson.version> <jackson.version>2.12.2</jackson.version>
<nifi.registry.version>0.8.0</nifi.registry.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> <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 <!-- 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 --> a specific version should override this property, or use a more specific property like abc.hadoop.version -->
@ -176,17 +176,6 @@
<updatePolicy>never</updatePolicy> <updatePolicy>never</updatePolicy>
</releases> </releases>
</pluginRepository> </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> </pluginRepositories>
<dependencyManagement> <dependencyManagement>