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 <[email protected]> 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 <[email protected]> --- 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>
