From 5d18da7fabc096f7e9b6eebffe9956773c88b18c Mon Sep 17 00:00:00 2001
From: Hans Van Akelyen <hans.van.akelyen@gmail.com>
Date: Tue, 6 Jan 2026 11:01:24 +0100
Subject: [PATCH] fix parquet output and some cleanup, fixes #6148

---
 engine-beam/pom.xml                           |  4 ++++
 lib/pom.xml                                   |  7 ++++++-
 .../engines/beam/src/assembly/assembly.xml    |  6 ++++++
 plugins/tech/neo4j/src/assembly/assembly.xml  |  2 ++
 plugins/tech/parquet/pom.xml                  | 21 +++++--------------
 .../tech/parquet/src/assembly/assembly.xml    |  7 ++++---
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/engine-beam/pom.xml b/engine-beam/pom.xml
index f4b8fd30595..fb75de70d65 100644
--- a/engine-beam/pom.xml
+++ b/engine-beam/pom.xml
@@ -69,6 +69,10 @@
                     <groupId>org.apache.beam</groupId>
                     <artifactId>beam-sdks-java-transform-service-launcher</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index e9349a548e8..677c805d687 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -140,7 +140,7 @@
         <springframework4.version>4.3.18</springframework4.version>
         <stax2-api.version>4.2.2</stax2-api.version>
         <tyrus-standalone-client.version>1.13.1</tyrus-standalone-client.version>
-        <woodstox.version>6.4.0</woodstox.version>
+        <woodstox.version>7.1.1</woodstox.version>
         <xerces.version>2.12.2</xerces.version>
         <xml-apis-ext.version>1.3.04</xml-apis-ext.version>
         <xmlunit.version>1.5</xmlunit.version>
@@ -819,6 +819,11 @@
                 <artifactId>jsoup</artifactId>
                 <version>${jsoup.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
+                <version>${woodstox.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/plugins/engines/beam/src/assembly/assembly.xml b/plugins/engines/beam/src/assembly/assembly.xml
index 9489e8d482b..147409ab8d7 100644
--- a/plugins/engines/beam/src/assembly/assembly.xml
+++ b/plugins/engines/beam/src/assembly/assembly.xml
@@ -154,6 +154,9 @@
                 <exclude>com.google.code.gson:gson:jar</exclude>
                 <exclude>org.apache.commons:commons-collections4:jar</exclude>
                 <exclude>org.jspecify:jspecify:jar</exclude>
+                <exclude>org.apache.commons:commons-lang3:jar</exclude>
+                <exclude>commons-collections:commons-collections:jar</exclude>
+                <exclude>com.fasterxml.woodstox:woodstox-core:jar</exclude>
             </excludes>
             <outputDirectory>lib/beam</outputDirectory>
         </dependencySet>
@@ -252,6 +255,9 @@
                 <include>io.confluent::jar</include>
                 <include>com.google.code.gson:gson:jar</include>
                 <include>org.apache.commons:commons-collections4:jar</include>
+                <include>org.apache.commons:commons-lang3:jar</include>
+                <include>commons-collections:commons-collections:jar</include>
+                <include>com.fasterxml.woodstox:woodstox-core:jar</include>
             </includes>
             <outputDirectory>lib/core</outputDirectory>
         </dependencySet>
diff --git a/plugins/tech/neo4j/src/assembly/assembly.xml b/plugins/tech/neo4j/src/assembly/assembly.xml
index 55aa8ff6934..1eda15cb8a8 100644
--- a/plugins/tech/neo4j/src/assembly/assembly.xml
+++ b/plugins/tech/neo4j/src/assembly/assembly.xml
@@ -51,6 +51,7 @@
             <excludes>
                 <exclude>org.apache.hop:hop-tech-neo4j:jar</exclude>
                 <exclude>org.reactivestreams:reactive-streams:jar</exclude>
+                <exclude>io.projectreactor:reactor-core:jar</exclude>
                 <exclude>io.netty::jar</exclude>
             </excludes>
             <outputDirectory>plugins/tech/neo4j/lib</outputDirectory>
@@ -59,6 +60,7 @@
             <scope>runtime</scope>
             <includes>
                 <include>org.reactivestreams:reactive-streams:jar</include>
+                <include>io.projectreactor:reactor-core:jar</include>
                 <include>io.netty::jar</include>
             </includes>
             <outputDirectory>lib/core</outputDirectory>
diff --git a/plugins/tech/parquet/pom.xml b/plugins/tech/parquet/pom.xml
index d4cab7c0a70..4e2c395092d 100644
--- a/plugins/tech/parquet/pom.xml
+++ b/plugins/tech/parquet/pom.xml
@@ -29,7 +29,7 @@
     <name>Hop Plugins Technology Parquet</name>
 
     <properties>
-        <parquet.version>1.15.2</parquet.version>
+        <parquet.version>1.16.0</parquet.version>
     </properties>
 
     <dependencyManagement>
@@ -45,6 +45,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
@@ -105,20 +109,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.parquet</groupId>
-            <artifactId>parquet-format-structures</artifactId>
-            <version>${parquet.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/plugins/tech/parquet/src/assembly/assembly.xml b/plugins/tech/parquet/src/assembly/assembly.xml
index 4a6fd025aae..35920ee88dc 100644
--- a/plugins/tech/parquet/src/assembly/assembly.xml
+++ b/plugins/tech/parquet/src/assembly/assembly.xml
@@ -48,12 +48,12 @@
         <dependencySet>
             <scope>runtime</scope>
             <excludes>
-                <exclude>
-                    org.apache.hop:hop-tech-parquet:jar
-                </exclude>
+                <exclude>org.apache.hop:hop-tech-parquet:jar</exclude>
+                <exclude>com.fasterxml.woodstox:woodstox-core:jar</exclude>
             </excludes>
             <includes>
                 <include>org.apache.parquet:*:jar</include>
+                <include>org.locationtech.jts:jts-core:jar</include>
             </includes>
             <outputDirectory>plugins/tech/parquet/lib</outputDirectory>
         </dependencySet>
@@ -62,6 +62,7 @@
             <includes>
                 <include>org.apache.hadoop:*:jar</include>
                 <include>org.apache.hadoop.thirdparty:*:jar</include>
+                <include>com.fasterxml.woodstox:woodstox-core:jar</include>
             </includes>
             <outputDirectory>lib/core</outputDirectory>
         </dependencySet>