This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new ab67daf891 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 ab67daf891 is described below commit ab67daf8912e8938dcb6405e6d15e4957b4da920 Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Thu Sep 14 15:10:40 2023 -0500 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 Signed-off-by: Joseph Witt <joew...@apache.org> --- c2/c2-client-bundle/c2-client-service/pom.xml | 1 - nifi-commons/nifi-flowfile-packager/pom.xml | 1 - nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-avro-bundle/pom.xml | 11 ----------- nifi-nar-bundles/nifi-cassandra-bundle/pom.xml | 6 ------ .../nifi-compress-bundle/nifi-compress-processors/pom.xml | 1 - nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml | 11 ----------- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 7 ------- .../nifi-extension-utils/nifi-database-utils/pom.xml | 11 ----------- .../nifi-extension-utils/nifi-hadoop-utils/pom.xml | 10 ---------- .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml | 10 ---------- .../nifi-extension-utils/nifi-record-utils/pom.xml | 6 ------ nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 ----- nifi-nar-bundles/nifi-graph-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-hbase-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-media-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-poi-bundle/pom.xml | 5 ----- nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-registry-bundle/pom.xml | 11 ----------- nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 6 ------ nifi-nar-bundles/nifi-standard-bundle/pom.xml | 9 --------- .../nifi-hadoop-dbcp-service-bundle/pom.xml | 10 ---------- .../nifi-hbase_2-client-service-bundle/pom.xml | 6 ------ .../nifi-lookup-services-bundle/pom.xml | 10 ---------- .../nifi-record-serialization-services-bundle/pom.xml | 11 ----------- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 11 ----------- .../nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 ------ pom.xml | 6 ++++++ 34 files changed, 6 insertions(+), 231 deletions(-) diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index 8fc6d9b9bb..e8114f4301 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -46,7 +46,6 @@ limitations under the License. <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.23.0</version> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index c91934e1d5..90fb83415a 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,7 +25,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.23.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 4772325560..17e9c8ae04 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -81,12 +81,6 @@ </exclusion> </exclusions> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override nimbus-jose-jwt 9.8.1 from hadoop-auth --> <dependency> <groupId>com.nimbusds</groupId> diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml index 352a754bc0..36c70fd0ba 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml @@ -29,15 +29,4 @@ <module>nifi-avro-processors</module> <module>nifi-avro-nar</module> </modules> - - <dependencyManagement> - <dependencies> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml index 389f79662e..5cee9149d5 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml @@ -47,12 +47,6 @@ <artifactId>nifi-cassandra-processors</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> diff --git a/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml b/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml index 121326799b..767ba5879e 100644 --- a/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml +++ b/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml @@ -32,7 +32,6 @@ language governing permissions and limitations under the License. --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.23.0</version> </dependency> <dependency> <groupId>com.github.jponge</groupId> diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml index 9e575b7e9b..4794a3508d 100644 --- a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml @@ -24,15 +24,4 @@ <module>nifi-confluent-schema-registry-service</module> <module>nifi-confluent-platform-nar</module> </modules> - - <dependencyManagement> - <dependencies> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml index a0796ddd42..ea7e766ef2 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml @@ -56,13 +56,6 @@ language governing permissions and limitations under the License. --> <artifactId>nifi-elasticsearch-restapi-processors</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - <dependency> <groupId>org.elasticsearch.client</groupId> <artifactId>elasticsearch-rest-client</artifactId> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml index c344b07d7c..fc15dadea3 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml @@ -23,17 +23,6 @@ <artifactId>nifi-database-utils</artifactId> - <dependencyManagement> - <dependencies> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml index 015b10abdd..f305bdf730 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml @@ -131,16 +131,6 @@ </exclusions> </dependency> </dependencies> - <dependencyManagement> - <dependencies> - <!-- Override commons-compress:1.19 from hadoop --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> <build> <plugins> <plugin> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml index 59b0f32b47..63fa5e8067 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml @@ -22,16 +22,6 @@ </parent> <artifactId>nifi-hadoop-record-utils</artifactId> <packaging>jar</packaging> - <dependencyManagement> - <dependencies> - <!-- Override commons-compress:1.19 --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml index d1ac6a09f4..1c76866fec 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml @@ -39,12 +39,6 @@ <artifactId>netty</artifactId> <version>${netty.3.version}</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 0705cb3fd2..0c500ad4ab 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -493,11 +493,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> diff --git a/nifi-nar-bundles/nifi-graph-bundle/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/pom.xml index 355279bc95..825aed5a4e 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/pom.xml @@ -46,12 +46,6 @@ <artifactId>nifi-graph-processors</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml index f9f0c36b3d..13b8d55dc3 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml @@ -32,12 +32,6 @@ <artifactId>netty</artifactId> <version>${netty.3.version}</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override nimbus-jose-jwt 9.8.1 from hadoop-auth --> <dependency> <groupId>com.nimbusds</groupId> diff --git a/nifi-nar-bundles/nifi-hbase-bundle/pom.xml b/nifi-nar-bundles/nifi-hbase-bundle/pom.xml index de8387b847..b5db69dea5 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hbase-bundle/pom.xml @@ -37,12 +37,6 @@ <artifactId>nifi-hbase-processors</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index a11ccf07d0..718c214538 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -68,12 +68,6 @@ <artifactId>avatica</artifactId> <version>${avatica.version}</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override commons-beanutils --> <dependency> <groupId>commons-beanutils</groupId> diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index cf993d6b68..27fa3ddff9 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -52,12 +52,6 @@ <artifactId>javax.el</artifactId> <version>3.0.1-b12</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override commons-beanutils --> <dependency> <groupId>commons-beanutils</groupId> diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml b/nifi-nar-bundles/nifi-media-bundle/pom.xml index 4fa2c02cbd..1f947c958e 100644 --- a/nifi-nar-bundles/nifi-media-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml @@ -38,12 +38,6 @@ <dependencyManagement> <dependencies> - <!-- Override version from tika-parsers --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override version from tika-parsers --> <dependency> <groupId>org.jsoup</groupId> diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index 99e372a680..ade276ec0f 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -50,12 +50,6 @@ <artifactId>nifi-mongodb-processors</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml index 2cc50d0a96..4689fde025 100644 --- a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml @@ -36,12 +36,6 @@ <artifactId>netty</artifactId> <version>${netty.3.version}</version> </dependency> - <!-- Override commons-compress:1.20 from avro --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override commons-beanutils --> <dependency> <groupId>commons-beanutils</groupId> diff --git a/nifi-nar-bundles/nifi-poi-bundle/pom.xml b/nifi-nar-bundles/nifi-poi-bundle/pom.xml index 706ff9a87b..3257c2754e 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-poi-bundle/pom.xml @@ -34,11 +34,6 @@ </modules> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml index ba128e4ed6..61720b8c62 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml @@ -43,12 +43,6 @@ <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override commons-beanutils --> <dependency> <groupId>commons-beanutils</groupId> diff --git a/nifi-nar-bundles/nifi-registry-bundle/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/pom.xml index 7676533e03..b45829ae37 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/pom.xml @@ -24,15 +24,4 @@ <module>nifi-registry-service</module> <module>nifi-registry-nar</module> </modules> - - <dependencyManagement> - <dependencies> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml index 158bc63be4..ba9593acfb 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml @@ -36,12 +36,6 @@ <artifactId>nifi-site-to-site-reporting-task</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml index d417b9519a..99ccb3403b 100644 --- a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml @@ -35,12 +35,6 @@ <artifactId>nifi-sql-reporting-tasks</artifactId> <version>1.24.0-SNAPSHOT</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override Guava 31.1. from calcite-core --> <dependency> <groupId>com.google.guava</groupId> diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 65b4a78d64..1555bc5874 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -102,15 +102,6 @@ <artifactId>metrics-ganglia</artifactId> <version>${yammer.metrics.version}</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> <dependency> <groupId>com.hierynomus</groupId> <artifactId>sshj</artifactId> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/pom.xml index ea6405f59e..1d64505abe 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/pom.xml @@ -26,14 +26,4 @@ <module>nifi-hadoop-dbcp-service</module> <module>nifi-hadoop-dbcp-service-nar</module> </modules> - <dependencyManagement> - <dependencies> - <!-- Override commons-compress:1.19 --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml index 74a78ff2ed..897b351469 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml @@ -55,12 +55,6 @@ <artifactId>netty</artifactId> <version>${netty.3.version}</version> </dependency> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override commons-beanutils --> <dependency> <groupId>commons-beanutils</groupId> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml index f0cc21b194..e6e2a8d1bc 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml @@ -25,14 +25,4 @@ <module>nifi-lookup-services</module> <module>nifi-lookup-services-nar</module> </modules> - <dependencyManagement> - <dependencies> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml index 5e41b52de2..3f4575d3ad 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml @@ -28,15 +28,4 @@ <module>nifi-record-serialization-services-nar</module> <module>nifi-record-serialization-services-shared</module> </modules> - - <dependencyManagement> - <dependencies> - <!-- Override commons-compress --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml index 07d1aa28f1..aaa2779f63 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml @@ -20,17 +20,6 @@ <artifactId>nifi-registry-test</artifactId> <packaging>jar</packaging> - <dependencyManagement> - <dependencies> - <!-- Override version from testcontainers --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml index 7c09540764..013fd25beb 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml @@ -32,12 +32,6 @@ <dependencyManagement> <dependencies> - <!-- Override commons-compress:1.19 from ranger --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.23.0</version> - </dependency> <!-- Override jetty-server:9.4.20 --> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/pom.xml b/pom.xml index 8da8f7a508..817941f870 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,7 @@ <okio.version>3.5.0</okio.version> <org.apache.commons.cli.version>1.5.0</org.apache.commons.cli.version> <org.apache.commons.codec.version>1.16.0</org.apache.commons.codec.version> + <org.apache.commons.compress.version>1.24.0</org.apache.commons.compress.version> <org.apache.commons.lang3.version>3.13.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.13.0</org.apache.commons.io.version> @@ -258,6 +259,11 @@ <artifactId>commons-codec</artifactId> <version>${org.apache.commons.codec.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>${org.apache.commons.compress.version}</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId>