You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2022/12/05 16:33:39 UTC
[nifi] branch support/nifi-1.19 updated (945e4f376d -> 111cab1c9a)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a change to branch support/nifi-1.19
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 945e4f376d NIFI-10898 This closes #6729. Removed unused test HTTP Servlets
new 9aa22fed0f NIFI-10941 Removed TestNG references
new 2a180e8a20 NIFI-10920 Upgraded Jettison from 1.5.1. to 1.5.2
new 6c77e9f427 NIFI-10930 Added LDAP_REFERRAL_STRATEGY variable for Docker
new 111cab1c9a NIFI-10947 This closes #6758. Upgraded Apache Commons Net to 3.9.0
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
minifi/pom.xml | 16 ------
nifi-assembly/NOTICE | 7 ---
nifi-commons/nifi-socket-utils/pom.xml | 1 -
.../nifi-enrich-processors/pom.xml | 1 -
.../nifi-framework/nifi-framework-cluster/pom.xml | 5 --
.../nifi-framework/nifi-framework-core/pom.xml | 5 --
.../state/providers/AbstractTestStateProvider.java | 10 ++--
.../local/TestWriteAheadLocalStateProvider.java | 8 +--
.../zookeeper/ITZooKeeperStateProvider.java | 51 ++++++++----------
.../zookeeper/TestZooKeeperStateProvider.java | 26 ++++++----
.../state/server/TestZooKeeperStateServer.java | 23 +++++----
.../TestStatusAnalyticsModelMapFactory.java | 10 ++--
...ComponentStatusRepositoryForComponentsTest.java | 15 +++---
.../cs/ControllerServiceReferenceIT.java | 6 +--
.../lifecycle/FlowFileRepositoryLifecycleIT.java | 12 ++---
.../integration/provenance/ProvenanceEventsIT.java | 8 +--
.../integration/swap/StandaloneSwapFileIT.java | 12 +++--
.../nifi/integration/versioned/ImportFlowIT.java | 54 +++----------------
.../TestFlowConfigurationArchiveManager.java | 60 +++++++++++-----------
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 13 +----
.../nifi-scripting-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-spark-bundle/pom.xml | 4 +-
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 --
.../dockermaven/sh/update_login_providers.sh | 1 +
.../nifi-registry-ranger-plugin/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-assembly/NOTICE | 3 --
nifi-toolkit/pom.xml | 16 ++++++
pom.xml | 26 ++++++++++
28 files changed, 176 insertions(+), 225 deletions(-)
[nifi] 04/04: NIFI-10947 This closes #6758. Upgraded Apache Commons Net to 3.9.0
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.19
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 111cab1c9aff962d272b7ca082d0647bb927820b
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Dec 5 08:48:57 2022 -0600
NIFI-10947 This closes #6758. Upgraded Apache Commons Net to 3.9.0
- Added Commons Net to managed dependencies in root Maven configuration
- Removed version references to 3.3 in MiNiFi and 3.6 in NiFi standard modules
Signed-off-by: Joe Witt <jo...@apache.org>
---
minifi/pom.xml | 5 -----
nifi-commons/nifi-socket-utils/pom.xml | 1 -
nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 -----
.../nifi-scripting-bundle/nifi-scripting-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 -----
pom.xml | 6 ++++++
7 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 26b317d816..95b6c29511 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -531,11 +531,6 @@ limitations under the License.
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.3</version>
- </dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml
index 137e05a0f1..f20ef3edac 100644
--- a/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi-commons/nifi-socket-utils/pom.xml
@@ -40,7 +40,6 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
index bb8d680942..82a1517fdd 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
@@ -70,7 +70,6 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.6</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index f857c4f74b..6ed009ea2a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -500,11 +500,6 @@
<artifactId>commons-compress</artifactId>
<version>1.21</version>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.6</version>
- </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index 1b56c6739f..18b4320aa9 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -106,7 +106,6 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.6</version>
</dependency>
<!-- For Jython 2.7.1 -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 38cd556d85..a73af852f8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -111,11 +111,6 @@
<artifactId>metrics-ganglia</artifactId>
<version>${yammer.metrics.version}</version>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.6</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
diff --git a/pom.xml b/pom.xml
index 4963746a80..cca992c217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
<okhttp.version>4.10.0</okhttp.version>
<org.apache.commons.cli.version>1.5.0</org.apache.commons.cli.version>
<org.apache.commons.lang3.version>3.12.0</org.apache.commons.lang3.version>
+ <org.apache.commons.net.version>3.9.0</org.apache.commons.net.version>
<org.apache.commons.io.version>2.11.0</org.apache.commons.io.version>
<org.apache.commons.text.version>1.10.0</org.apache.commons.text.version>
<org.apache.httpcomponents.httpclient.version>4.5.13</org.apache.httpcomponents.httpclient.version>
@@ -255,6 +256,11 @@
<artifactId>commons-lang3</artifactId>
<version>${org.apache.commons.lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${org.apache.commons.net.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
[nifi] 02/04: NIFI-10920 Upgraded Jettison from 1.5.1. to 1.5.2
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.19
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 2a180e8a201481d0756617f9fda428a71888b756
Author: mr1716 <ms...@rit.edu>
AuthorDate: Thu Dec 1 15:37:24 2022 -0500
NIFI-10920 Upgraded Jettison from 1.5.1. to 1.5.2
This closes #6747
Signed-off-by: David Handermann <ex...@apache.org>
---
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-spark-bundle/pom.xml | 4 ++--
.../nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 47c8a6d794..f857c4f74b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -274,7 +274,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
index dbc4c93911..abcda30352 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -89,4 +89,4 @@
<version>1.19.1-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index f296b81299..040a3f344d 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2</version>
</dependency>
</dependencies>
[nifi] 03/04: NIFI-10930 Added LDAP_REFERRAL_STRATEGY variable for Docker
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.19
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 6c77e9f427581e0fa85139e670fb25c8236bfe0e
Author: Dominique Jean-Prost <dj...@gmail.com>
AuthorDate: Mon Nov 28 14:56:38 2022 +0100
NIFI-10930 Added LDAP_REFERRAL_STRATEGY variable for Docker
This closes #6749
Signed-off-by: David Handermann <ex...@apache.org>
---
.../nifi-registry-docker-maven/dockermaven/sh/update_login_providers.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/nifi-registry/nifi-registry-docker-maven/dockermaven/sh/update_login_providers.sh b/nifi-registry/nifi-registry-docker-maven/dockermaven/sh/update_login_providers.sh
index e3280b56aa..b6e4650a42 100755
--- a/nifi-registry/nifi-registry-docker-maven/dockermaven/sh/update_login_providers.sh
+++ b/nifi-registry/nifi-registry-docker-maven/dockermaven/sh/update_login_providers.sh
@@ -45,3 +45,4 @@ edit_property 'Url' "${LDAP_URL}"
edit_property 'User Search Base' "${LDAP_USER_SEARCH_BASE}"
edit_property 'User Search Filter' "${LDAP_USER_SEARCH_FILTER}"
edit_property 'Identity Strategy' "${LDAP_IDENTITY_STRATEGY}"
+edit_property 'Referral Strategy' "${LDAP_REFERRAL_STRATEGY}"
[nifi] 01/04: NIFI-10941 Removed TestNG references
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.19
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 9aa22fed0fe3ba8b94db1c380505f298991a666e
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Sat Dec 3 22:36:56 2022 -0600
NIFI-10941 Removed TestNG references
- Replaced TestNG assertions with JUnit 5
- Excluded testng transitive dependencies from groovy-all
- Added testng exclusion to Maven Enforcer configuration
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #6753.
---
minifi/pom.xml | 11 ----
nifi-assembly/NOTICE | 7 ---
.../nifi-framework/nifi-framework-cluster/pom.xml | 5 --
.../nifi-framework/nifi-framework-core/pom.xml | 5 --
.../state/providers/AbstractTestStateProvider.java | 10 ++--
.../local/TestWriteAheadLocalStateProvider.java | 8 +--
.../zookeeper/ITZooKeeperStateProvider.java | 51 ++++++++----------
.../zookeeper/TestZooKeeperStateProvider.java | 26 ++++++----
.../state/server/TestZooKeeperStateServer.java | 23 +++++----
.../TestStatusAnalyticsModelMapFactory.java | 10 ++--
...ComponentStatusRepositoryForComponentsTest.java | 15 +++---
.../cs/ControllerServiceReferenceIT.java | 6 +--
.../lifecycle/FlowFileRepositoryLifecycleIT.java | 12 ++---
.../integration/provenance/ProvenanceEventsIT.java | 8 +--
.../integration/swap/StandaloneSwapFileIT.java | 12 +++--
.../nifi/integration/versioned/ImportFlowIT.java | 54 +++----------------
.../TestFlowConfigurationArchiveManager.java | 60 +++++++++++-----------
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 6 ---
nifi-toolkit/nifi-toolkit-assembly/NOTICE | 3 --
nifi-toolkit/pom.xml | 16 ++++++
pom.xml | 20 ++++++++
21 files changed, 165 insertions(+), 203 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index f9c5f9e582..26b317d816 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -837,21 +837,10 @@ limitations under the License.
<artifactId>spark-streaming_2.10</artifactId>
<version>1.6.0</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.8</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>3.0.8</version>
- </dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 451b81fb85..96b6927000 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -1164,7 +1164,6 @@ The following binary components are provided under the Apache Software License v
groovy-templates
groovy-test
groovy-test-junit5
- groovy-testng
groovy-xml
The following NOTICE information applies:
Groovy Language
@@ -1970,12 +1969,6 @@ The following binary components are provided under the Apache Software License v
* COMMIT TAG:
* https://github.com/metamx/java-util/commit/826021f
- This product contains a modified version of TestNG 6.8.7
- * LICENSE:
- * http://testng.org/license/ (Apache License, Version 2.0)
- * HOMEPAGE:
- * http://testng.org/
-
This product contains a modified version of Metamarkets bytebuffer-collections library
* LICENSE:
* https://github.com/metamx/bytebuffer-collections/blob/master/LICENSE (Apache License, Version 2.0)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
index 29003a5da9..c9d0d8fa3e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
@@ -152,11 +152,6 @@
<artifactId>nifi-mock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Spock testing dependencies -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index e2f742fa24..7f9b5ee989 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -219,11 +219,6 @@
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/AbstractTestStateProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/AbstractTestStateProvider.java
index 80037fe115..ccff20597c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/AbstractTestStateProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/AbstractTestStateProvider.java
@@ -17,10 +17,10 @@
package org.apache.nifi.controller.state.providers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.Collections;
@@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.nifi.components.state.StateMap;
import org.apache.nifi.components.state.StateProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/local/TestWriteAheadLocalStateProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/local/TestWriteAheadLocalStateProvider.java
index 3bfdb71c34..b498099633 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/local/TestWriteAheadLocalStateProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/local/TestWriteAheadLocalStateProvider.java
@@ -26,8 +26,8 @@ import org.apache.nifi.components.state.StateProviderInitializationContext;
import org.apache.nifi.controller.state.StateMapUpdate;
import org.apache.nifi.controller.state.providers.AbstractTestStateProvider;
import org.apache.nifi.logging.ComponentLog;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.wali.WriteAheadRepository;
import javax.net.ssl.SSLContext;
@@ -42,7 +42,7 @@ public class TestWriteAheadLocalStateProvider extends AbstractTestStateProvider
private StateProvider provider;
private WriteAheadRepository<StateMapUpdate> wal;
- @Before
+ @BeforeEach
public void setup() throws IOException {
provider = new WriteAheadLocalStateProvider();
final Map<PropertyDescriptor, PropertyValue> properties = new HashMap<>();
@@ -92,7 +92,7 @@ public class TestWriteAheadLocalStateProvider extends AbstractTestStateProvider
});
}
- @After
+ @AfterEach
public void cleanup() throws IOException {
provider.onComponentRemoved(componentId);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/ITZooKeeperStateProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/ITZooKeeperStateProvider.java
index d134bce802..65ddc1478b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/ITZooKeeperStateProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/ITZooKeeperStateProvider.java
@@ -33,13 +33,13 @@ import org.apache.nifi.security.util.TlsConfiguration;
import org.apache.nifi.util.NiFiProperties;
import org.apache.zookeeper.server.ServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testng.Assert;
import javax.net.ssl.SSLContext;
import java.io.File;
@@ -53,6 +53,8 @@ import java.util.Map;
import static org.apache.nifi.leader.election.ITSecureClientZooKeeperFactory.createAndStartServer;
import static org.apache.nifi.leader.election.ITSecureClientZooKeeperFactory.createSecureClientProperties;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
@@ -60,30 +62,27 @@ public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
private volatile StateProvider provider;
private volatile ZooKeeperServer zkServer;
- private static Map<PropertyDescriptor, String> stateProviderProperties = new HashMap<>();
+ private final static Map<PropertyDescriptor, String> stateProviderProperties = new HashMap<>();
private static Path tempDir;
- private static Path dataDir;
- private static int clientPort;
- private static ServerCnxnFactory serverConnectionFactory;
private static NiFiProperties nifiProperties;
private static TlsConfiguration tlsConfiguration;
- @BeforeClass
+ @BeforeAll
public static void setTlsConfiguration() {
tlsConfiguration = new TemporaryKeyStoreBuilder().build();
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
tempDir = Paths.get("target/TestZooKeeperStateProvider");
- dataDir = tempDir.resolve("state");
- clientPort = InstanceSpec.getRandomPort();
+ final Path dataDir = tempDir.resolve("state");
+ final int clientPort = InstanceSpec.getRandomPort();
Files.createDirectory(tempDir);
// Set up the testing server
- serverConnectionFactory = createAndStartServer(
+ final ServerCnxnFactory serverConnectionFactory = createAndStartServer(
dataDir,
tempDir,
clientPort,
@@ -176,7 +175,7 @@ public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
return provider;
}
- @After
+ @AfterEach
public void clear() throws IOException {
try {
if (provider != null) {
@@ -205,7 +204,8 @@ public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
return provider;
}
- @Test(timeout = 30000)
+ @Timeout(30)
+ @Test
public void testStateTooLargeExceptionThrownOnSetState() throws InterruptedException {
final Map<String, String> state = new HashMap<>();
final StringBuilder sb = new StringBuilder();
@@ -223,7 +223,7 @@ public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
while (true) {
try {
getProvider().setState(state, componentId);
- Assert.fail("Expected StateTooLargeException");
+ fail("Expected StateTooLargeException");
} catch (final StateTooLargeException stle) {
// expected behavior.
break;
@@ -235,13 +235,14 @@ public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
Thread.sleep(1000L);
} catch (final Exception e) {
logger.error("Something went wrong attempting to set the state in testStateTooLargeExceptionThrownOnSetState()");
- Assert.fail("Expected StateTooLargeException but " + e.getClass() + " was thrown", e);
+ fail("Expected StateTooLargeException but " + e.getClass() + " was thrown", e);
}
}
}
- @Test(timeout = 30000)
- public void testStateTooLargeExceptionThrownOnReplace() throws IOException, InterruptedException {
+ @Timeout(30)
+ @Test
+ public void testStateTooLargeExceptionThrownOnReplace() throws InterruptedException {
final Map<String, String> state = new HashMap<>();
final StringBuilder sb = new StringBuilder();
@@ -271,14 +272,6 @@ public class ITZooKeeperStateProvider extends AbstractTestStateProvider {
}
}
- try {
- getProvider().replace(getProvider().getState(componentId), state, componentId);
- Assert.fail("Expected StateTooLargeException");
- } catch (final StateTooLargeException stle) {
- // expected behavior.
- } catch (final Exception e) {
- logger.error("Something went wrong in attempting to get the state in testStateTooLargeExceptionThrownOnReplace()");
- Assert.fail("Expected StateTooLargeException", e);
- }
+ assertThrows(StateTooLargeException.class, () -> getProvider().replace(getProvider().getState(componentId), state, componentId));
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java
index ebe2844cc3..75e5e5780e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/providers/zookeeper/TestZooKeeperStateProvider.java
@@ -27,10 +27,10 @@ import org.apache.nifi.components.state.exception.StateTooLargeException;
import org.apache.nifi.controller.state.providers.AbstractTestStateProvider;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.util.NiFiProperties;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.testng.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import javax.net.ssl.SSLContext;
import java.io.IOException;
@@ -42,6 +42,7 @@ import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
@@ -63,7 +64,7 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
defaultProperties.put(ZooKeeperStateProvider.ACCESS_CONTROL, ZooKeeperStateProvider.OPEN_TO_WORLD.getValue());
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
zkServer = new TestingServer(true);
zkServer.start();
@@ -134,7 +135,7 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
return NiFiProperties.createBasicNiFiProperties(null, keystoreProps);
}
- @After
+ @AfterEach
public void clear() throws IOException {
try {
if (provider != null) {
@@ -155,7 +156,8 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
return provider;
}
- @Test(timeout = 30000)
+ @Timeout(30)
+ @Test
public void testStateTooLargeExceptionThrownOnSetState() throws InterruptedException {
final Map<String, String> state = new HashMap<>();
final StringBuilder sb = new StringBuilder();
@@ -173,7 +175,7 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
while (true) {
try {
getProvider().setState(state, componentId);
- Assert.fail("Expected StateTooLargeException");
+ fail("Expected StateTooLargeException");
} catch (final StateTooLargeException stle) {
// expected behavior.
break;
@@ -184,12 +186,13 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
// does not succeeed within 30 seconds.
Thread.sleep(1000L);
} catch (final Exception e) {
- Assert.fail("Expected StateTooLargeException but " + e.getClass() + " was thrown", e);
+ fail("Expected StateTooLargeException but " + e.getClass() + " was thrown", e);
}
}
}
- @Test(timeout = 30000)
+ @Timeout(30)
+ @Test
public void testStateTooLargeExceptionThrownOnReplace() throws InterruptedException {
final Map<String, String> state = new HashMap<>();
final StringBuilder sb = new StringBuilder();
@@ -223,7 +226,8 @@ public class TestZooKeeperStateProvider extends AbstractTestStateProvider {
assertThrows(StateTooLargeException.class, () -> getProvider().replace(getProvider().getState(componentId), state, componentId));
}
- @Test(timeout = 5000)
+ @Timeout(30)
+ @Test
public void testStateTooLargeExceptionThrownOnReplaceSmallJuteMaxbuffer() throws Exception {
final Map<String, String> initialState = new HashMap<>();
final String stateValue = UUID.randomUUID().toString();
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
index 78e735c691..33b982dd1e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
@@ -25,10 +25,9 @@ import org.apache.zookeeper.client.FourLetterWordMain;
import org.apache.zookeeper.common.X509Exception.SSLContextException;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.testng.Assert;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.io.PrintWriter;
@@ -39,6 +38,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class TestZooKeeperStateServer {
private static ZooKeeperStateServer zkServer;
@@ -47,7 +49,7 @@ public class TestZooKeeperStateServer {
private static Path zkServerConfig;
private static int clientPort;
- @BeforeClass
+ @BeforeAll
public static void setup() throws IOException, ConfigException {
tempDir = Paths.get("target", "TestZooKeeperStateServer");
dataDir = tempDir.resolve("state");
@@ -74,7 +76,7 @@ public class TestZooKeeperStateServer {
if (zkServer != null) zkServer.start();
}
- @AfterClass
+ @AfterAll
public static void cleanup() throws IOException {
if (zkServer != null) {
try {
@@ -103,14 +105,14 @@ public class TestZooKeeperStateServer {
@Test
public void testServerCreated() {
- Assert.assertNotNull(zkServer);
+ assertNotNull(zkServer);
}
@Test
public void testServerOk() throws IOException, SSLContextException {
final String imok = FourLetterWordMain.send4LetterWord("localhost",
clientPort, "ruok", false, 1000);
- Assert.assertEquals(imok, "imok\n");
+ assertEquals(imok, "imok\n");
}
@Test
@@ -125,8 +127,7 @@ public class TestZooKeeperStateServer {
final String createResult = client.create().forPath(testPath, new byte[0]);
final Stat checkExistsResult = client.checkExists().forPath(testPath);
- Assert.assertEquals(createResult, testPath);
- Assert.assertNotNull(checkExistsResult);
+ assertEquals(createResult, testPath);
+ assertNotNull(checkExistsResult);
}
-
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
index 2f5127d68f..96363a52bf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
@@ -16,8 +16,8 @@
*/
package org.apache.nifi.controller.status.analytics;
-import static org.junit.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collections;
import java.util.HashMap;
@@ -29,15 +29,15 @@ import org.apache.nifi.nar.StandardExtensionDiscoveringManager;
import org.apache.nifi.nar.SystemBundle;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.util.Tuple;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestStatusAnalyticsModelMapFactory {
protected NiFiProperties nifiProperties;
protected ExtensionManager extensionManager;
- @Before
+ @BeforeEach
public void setup() {
final Map<String, String> otherProps = new HashMap<>();
final String propsFile = "src/test/resources/conf/nifi.properties";
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryForComponentsTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryForComponentsTest.java
index f504a24509..b700d507a7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryForComponentsTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryForComponentsTest.java
@@ -17,8 +17,8 @@
package org.apache.nifi.controller.status.history;
import org.apache.nifi.util.NiFiProperties;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.time.LocalDateTime;
@@ -26,8 +26,9 @@ import java.time.ZoneOffset;
import java.util.Date;
import java.util.List;
-import static junit.framework.TestCase.assertTrue;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* This class verifies the VolatileComponentStatusRepository getConnectionStatusHistory method
@@ -41,7 +42,7 @@ public class VolatileComponentStatusRepositoryForComponentsTest {
private static final int FIVE_MINUTES = 300000;
private static int BUFSIZE3 = 10;
- @BeforeClass
+ @BeforeAll
public static void createBuffers() {
// Fill the repo1 buffer completely with Date objects at five-minute intervals
// This provides dates up to around Jul 1979
@@ -84,7 +85,7 @@ public class VolatileComponentStatusRepositoryForComponentsTest {
List<Date> dates = repo.filterDates(null, null, Integer.MAX_VALUE);
assert repo.timestamps != null;
assertEquals(repo.timestamps.getSize(), dates.size());
- assertTrue(dates.equals(repo.timestamps.asList()));
+ assertEquals(dates, repo.timestamps.asList());
repo.timestamps.add(new Date());
}
@@ -212,7 +213,7 @@ public class VolatileComponentStatusRepositoryForComponentsTest {
emptyRepo.timestamps.add(new Date(i * FIVE_MINUTES));
List<Date> dates = emptyRepo.filterDates(null, null, Integer.MAX_VALUE);
if (i < BUFSIZE3 - 1) {
- assertEquals(null, emptyRepo.timestamps.getOldestElement());
+ assertNull(emptyRepo.timestamps.getOldestElement());
} else {
assertEquals(emptyRepo.timestamps.getOldestElement(), dates.get(0));
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/cs/ControllerServiceReferenceIT.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/cs/ControllerServiceReferenceIT.java
index 1462e3b2df..f3d5dbdbc4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/cs/ControllerServiceReferenceIT.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/cs/ControllerServiceReferenceIT.java
@@ -24,7 +24,7 @@ import org.apache.nifi.controller.service.ControllerServiceNode;
import org.apache.nifi.integration.DirectInjectionExtensionManager;
import org.apache.nifi.integration.FrameworkIntegrationTest;
import org.apache.nifi.processor.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Collection;
import java.util.Collections;
@@ -32,8 +32,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
-import static org.junit.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class ControllerServiceReferenceIT extends FrameworkIntegrationTest {
@Override
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/lifecycle/FlowFileRepositoryLifecycleIT.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/lifecycle/FlowFileRepositoryLifecycleIT.java
index 2c64930704..e7e75c15cb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/lifecycle/FlowFileRepositoryLifecycleIT.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/lifecycle/FlowFileRepositoryLifecycleIT.java
@@ -26,18 +26,18 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.integration.FrameworkIntegrationTest;
import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.reporting.Bulletin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.testng.Assert.assertNull;
-import static org.testng.AssertJUnit.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class FlowFileRepositoryLifecycleIT extends FrameworkIntegrationTest {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/provenance/ProvenanceEventsIT.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/provenance/ProvenanceEventsIT.java
index 6ef7bbc0d3..5848e4e1fb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/provenance/ProvenanceEventsIT.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/provenance/ProvenanceEventsIT.java
@@ -22,7 +22,7 @@ import org.apache.nifi.integration.FrameworkIntegrationTest;
import org.apache.nifi.provenance.ProvenanceEventRecord;
import org.apache.nifi.provenance.ProvenanceEventRepository;
import org.apache.nifi.provenance.ProvenanceEventType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,9 +32,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ProvenanceEventsIT extends FrameworkIntegrationTest {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/swap/StandaloneSwapFileIT.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/swap/StandaloneSwapFileIT.java
index 88470ff459..57ba2c3f74 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/swap/StandaloneSwapFileIT.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/swap/StandaloneSwapFileIT.java
@@ -24,18 +24,20 @@ import org.apache.nifi.controller.queue.QueueDiagnostics;
import org.apache.nifi.controller.repository.FlowFileRecord;
import org.apache.nifi.integration.FrameworkIntegrationTest;
import org.apache.nifi.integration.processors.GenerateProcessor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.Collections;
import java.util.concurrent.ExecutionException;
-import static org.junit.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class StandaloneSwapFileIT extends FrameworkIntegrationTest {
- @Test(timeout=60_000)
+ @Timeout(60)
+ @Test
public void testSwapOnRestart() throws ExecutionException, InterruptedException, IOException {
final ProcessorNode generator = createProcessorNode(GenerateProcessor.class);
generator.setProperties(Collections.singletonMap(GenerateProcessor.COUNT.getName(), "60000"));
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/versioned/ImportFlowIT.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/versioned/ImportFlowIT.java
index fd6d77ce13..daaf8e4d46 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/versioned/ImportFlowIT.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/integration/versioned/ImportFlowIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.integration.versioned;
-import org.apache.nifi.bundle.BundleCoordinate;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.validation.ValidationStatus;
import org.apache.nifi.connectable.Connection;
@@ -26,7 +25,6 @@ import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ProcessorNode;
import org.apache.nifi.controller.StandardSnippet;
import org.apache.nifi.controller.service.ControllerServiceNode;
-import org.apache.nifi.flow.Bundle;
import org.apache.nifi.flow.VersionedControllerService;
import org.apache.nifi.flow.VersionedComponent;
import org.apache.nifi.flow.VersionedExternalFlow;
@@ -47,8 +45,6 @@ import org.apache.nifi.parameter.ParameterReferenceManager;
import org.apache.nifi.parameter.StandardParameterContext;
import org.apache.nifi.parameter.StandardParameterReferenceManager;
import org.apache.nifi.processor.Processor;
-import org.apache.nifi.registry.bucket.Bucket;
-import org.apache.nifi.registry.flow.VersionedFlow;
import org.apache.nifi.registry.flow.diff.ComparableDataFlow;
import org.apache.nifi.registry.flow.diff.ConciseEvolvingDifferenceDescriptor;
import org.apache.nifi.registry.flow.diff.DifferenceType;
@@ -74,11 +70,11 @@ import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ImportFlowIT extends FrameworkIntegrationTest {
@Override
@@ -319,7 +315,7 @@ public class ImportFlowIT extends FrameworkIntegrationTest {
final ProcessorNode initialImportedProcessor = innerGroup.getProcessors().iterator().next();
assertEquals("user", initialImportedProcessor.getProperty(UsernamePasswordProcessor.USERNAME).getRawValue());
- assertNull("pass", initialImportedProcessor.getProperty(UsernamePasswordProcessor.PASSWORD).getRawValue());
+ assertNull(initialImportedProcessor.getProperty(UsernamePasswordProcessor.PASSWORD).getRawValue());
// Update the sensitive property to "pass"
initialImportedProcessor.setProperties(initialProperties);
@@ -669,7 +665,7 @@ public class ImportFlowIT extends FrameworkIntegrationTest {
}
@Test
- public void testExportImportFlowSwitchesVersionedIdToAndFromInstanceIdOfParameterReferencedControllerService() throws ExecutionException, InterruptedException {
+ public void testExportImportFlowSwitchesVersionedIdToAndFromInstanceIdOfParameterReferencedControllerService() {
ControllerServiceNode controllerService = createControllerServiceNode(NopControllerService.class);
ProcessorNode processor = createProcessorNode(NopServiceReferencingProcessor.class);
@@ -761,8 +757,6 @@ public class ImportFlowIT extends FrameworkIntegrationTest {
}
private VersionedExternalFlow createFlowSnapshot(final ProcessGroup group) {
- createBundle();
-
final NiFiRegistryFlowMapper flowMapper = new NiFiRegistryFlowMapper(getExtensionManager());
InstantiatedVersionedProcessGroup instantiatedVersionedProcessGroup = flowMapper.mapNonVersionedProcessGroup(group, getFlowController().getControllerServiceProvider());
@@ -783,38 +777,4 @@ public class ImportFlowIT extends FrameworkIntegrationTest {
return flow;
}
-
- private VersionedProcessGroup createFlowContents() {
- final VersionedProcessGroup flowContents = new VersionedProcessGroup();
- flowContents.setIdentifier("unit-test-flow-contents");
- flowContents.setName("Unit Test");
- return flowContents;
- }
-
- private void createBundle() {
- final BundleCoordinate coordinate = getSystemBundle().getBundleDetails().getCoordinate();
- final Bundle bundle = new Bundle();
- bundle.setArtifact(coordinate.getId());
- bundle.setGroup(coordinate.getGroup());
- bundle.setVersion(coordinate.getVersion());
- }
-
- private VersionedFlow createVersionedFlow() {
- final VersionedFlow flow = new VersionedFlow();
- flow.setBucketIdentifier("unit-test-bucket");
- flow.setBucketName("Unit Test Bucket");
- flow.setCreatedTimestamp(System.currentTimeMillis());
- flow.setIdentifier("unit-test-flow");
- flow.setName("Unit Test Flow");
- return flow;
- }
-
- private Bucket createBucket() {
- final Bucket bucket = new Bucket();
- bucket.setCreatedTimestamp(System.currentTimeMillis());
- bucket.setIdentifier("unit-test-bucket");
- bucket.setName("Unit Test Bucket");
- return bucket;
- }
-
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TestFlowConfigurationArchiveManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TestFlowConfigurationArchiveManager.java
index 76fe6c45af..ce7241d274 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TestFlowConfigurationArchiveManager.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TestFlowConfigurationArchiveManager.java
@@ -17,8 +17,8 @@
package org.apache.nifi.persistence;
import org.apache.nifi.util.NiFiProperties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -35,18 +35,20 @@ import java.nio.file.attribute.FileTime;
import java.text.SimpleDateFormat;
import java.util.Date;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertNull;
public class TestFlowConfigurationArchiveManager {
private final File flowXmlFile = new File("./target/flow-archive/flow.xml.gz");
private final File archiveDir = new File("./target/flow-archive");
- @Before
+ @BeforeEach
public void before() throws Exception {
// Clean up old files.
@@ -141,8 +143,8 @@ public class TestFlowConfigurationArchiveManager {
assertNull(getPrivateFieldValue(archiveManager, "maxStorageBytes"));
}
- @Test(expected = NoSuchFileException.class)
- public void testArchiveWithoutOriginalFile() throws Exception {
+ @Test
+ public void testArchiveWithoutOriginalFile() {
final NiFiProperties properties = mock(NiFiProperties.class);
when(properties.getFlowConfigurationArchiveDir()).thenReturn(archiveDir.getPath());
when(properties.getFlowConfigurationFile()).thenReturn(flowXmlFile);
@@ -151,7 +153,7 @@ public class TestFlowConfigurationArchiveManager {
final File flowXmlFile = new File("does-not-exist");
final FlowConfigurationArchiveManager archiveManager = new FlowConfigurationArchiveManager(properties);
- archiveManager.archive(flowXmlFile);
+ assertThrows(NoSuchFileException.class, () -> archiveManager.archive(flowXmlFile));
}
private void createSimulatedOldArchives(final File[] oldArchives, final long intervalMillis) throws Exception {
@@ -202,14 +204,14 @@ public class TestFlowConfigurationArchiveManager {
final File archive = archiveManager.archive(flowXmlFile);
- assertTrue(!oldArchives[0].exists()); // -5 min
- assertTrue(!oldArchives[1].exists()); // -4 min
+ assertFalse(oldArchives[0].exists()); // -5 min
+ assertFalse(oldArchives[1].exists()); // -4 min
assertTrue(oldArchives[2].isFile()); // -3 min
assertTrue(oldArchives[3].isFile()); // -2 min
assertTrue(oldArchives[4].isFile()); // -1 min
assertTrue(archive.exists()); // new archive
- assertTrue("Original file should remain intact", flowXmlFile.isFile());
+ assertTrue(flowXmlFile.isFile(), "Original file should remain intact");
}
@Test
@@ -225,14 +227,14 @@ public class TestFlowConfigurationArchiveManager {
final File archive = archiveManager.archive(flowXmlFile);
- assertTrue(!oldArchives[0].exists()); // -5 min
- assertTrue(!oldArchives[1].exists()); // -4 min
- assertTrue(!oldArchives[2].exists()); // -3 min
- assertTrue(!oldArchives[3].exists()); // -2 min
+ assertFalse(oldArchives[0].exists()); // -5 min
+ assertFalse(oldArchives[1].exists()); // -4 min
+ assertFalse(oldArchives[2].exists()); // -3 min
+ assertFalse(oldArchives[3].exists()); // -2 min
assertTrue(oldArchives[4].exists()); // -1 min
assertTrue(archive.exists()); // new archive
- assertTrue("Original file should remain intact", flowXmlFile.isFile());
+ assertTrue(flowXmlFile.isFile(), "Original file should remain intact");
}
@Test
@@ -248,14 +250,14 @@ public class TestFlowConfigurationArchiveManager {
final File archive = archiveManager.archive(flowXmlFile);
- assertTrue(!oldArchives[0].exists()); // -5 min
- assertTrue(!oldArchives[1].exists()); // -4 min
- assertTrue(!oldArchives[2].exists()); // -3 min
- assertTrue(!oldArchives[3].exists()); // -2 min
+ assertFalse(oldArchives[0].exists()); // -5 min
+ assertFalse(oldArchives[1].exists()); // -4 min
+ assertFalse(oldArchives[2].exists()); // -3 min
+ assertFalse(oldArchives[3].exists()); // -2 min
assertTrue(oldArchives[4].exists()); // -1 min
assertTrue(archive.exists()); // new archive
- assertTrue("Original file should remain intact", flowXmlFile.isFile());
+ assertTrue(flowXmlFile.isFile(), "Original file should remain intact");
}
@Test
@@ -270,14 +272,14 @@ public class TestFlowConfigurationArchiveManager {
final File archive = archiveManager.archive(flowXmlFile);
- assertTrue(!oldArchives[0].exists()); // -5 min
- assertTrue(!oldArchives[1].exists()); // -4 min
- assertTrue(!oldArchives[2].exists()); // -3 min
- assertTrue(!oldArchives[3].exists()); // -2 min
- assertTrue(!oldArchives[4].exists()); // -1 min
- assertTrue("Even if flow config file is larger than maxStorage file, it can be archived", archive.exists()); // new archive
+ assertFalse(oldArchives[0].exists()); // -5 min
+ assertFalse(oldArchives[1].exists()); // -4 min
+ assertFalse(oldArchives[2].exists()); // -3 min
+ assertFalse(oldArchives[3].exists()); // -2 min
+ assertFalse(oldArchives[4].exists()); // -1 min
+ assertTrue(archive.exists(), "Even if flow config file is larger than maxStorage file, it can be archived"); // new archive
- assertTrue("Original file should remain intact", flowXmlFile.isFile());
+ assertTrue(flowXmlFile.isFile(), "Original file should remain intact");
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 1ac5336701..47c8a6d794 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -457,12 +457,6 @@
<version>${curator.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.8</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
diff --git a/nifi-toolkit/nifi-toolkit-assembly/NOTICE b/nifi-toolkit/nifi-toolkit-assembly/NOTICE
index 43e9d3d664..9e7f86fd03 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/NOTICE
+++ b/nifi-toolkit/nifi-toolkit-assembly/NOTICE
@@ -126,9 +126,6 @@ The following binary components are provided under the Apache Software License v
groovy-sql
groovy-swing
groovy-templates
- groovy-test
- groovy-test-junit5
- groovy-testng
groovy-xml
The following NOTICE information applies:
Groovy Language
diff --git a/nifi-toolkit/pom.xml b/nifi-toolkit/pom.xml
index be5686318b..fc34eeab2b 100644
--- a/nifi-toolkit/pom.xml
+++ b/nifi-toolkit/pom.xml
@@ -50,6 +50,22 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4797e31378..4963746a80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,6 +325,24 @@
<version>${nifi.groovy.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -948,6 +966,8 @@
</requireReleaseDeps>
<bannedDependencies>
<excludes>
+ <!-- JUnit 5 is the preferred test framework -->
+ <exclude>org.testng:testng</exclude>
<!-- Cat-X Deps -->
<exclude>org.json:json:*:*:compile</exclude>
<exclude>c3p0:c3p0:*:*:compile</exclude>