[nifi] branch main updated: NIFI-10651 Upgraded Iceberg transitive dependencies

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mattyb149 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 523dd94045 NIFI-10651 Upgraded Iceberg transitive dependencies
523dd94045 is described below

commit 523dd9404585dcdc44f76ebfd78d52c61105137a
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Oct 14 10:29:49 2022 -0500

    NIFI-10651 Upgraded Iceberg transitive dependencies
    
    - Followed dependency override approach from nifi-hive-bundle based on Hive dependencies
    
    NIFI-10651 Removed unnecessary Calcite dependency references
    
    Signed-off-by: Matthew Burgess <ma...@apache.org>
    
    This closes #6533
---
 nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
index 6eb5af7028..b3b948dfa4 100644
--- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
@@ -41,4 +41,49 @@
         <module>nifi-iceberg-processors-nar</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+                <version>${netty.3.version}</version>
+            </dependency>
+            <!-- Override snapshot versions of javax.el -->
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <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.21</version>
+            </dependency>
+            <!-- Override commons-beanutils -->
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.9.4</version>
+            </dependency>
+            <!-- Override derby -->
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.14.2.0</version>
+            </dependency>
+            <!-- Override zookeeper -->
+            <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.version}</version>
+            </dependency>
+            <!-- Override ant -->
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>1.10.12</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
\ No newline at end of file