Skip to content

Commit d6b7b57

Browse files
authored
fix parquet output and some cleanup, fixes #6148 (#6303)
1 parent 2e399c6 commit d6b7b57

File tree

6 files changed

+27
-20
lines changed

6 files changed

+27
-20
lines changed

engine-beam/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
<groupId>org.apache.beam</groupId>
7070
<artifactId>beam-sdks-java-transform-service-launcher</artifactId>
7171
</exclusion>
72+
<exclusion>
73+
<groupId>org.apache.commons</groupId>
74+
<artifactId>commons-lang3</artifactId>
75+
</exclusion>
7276
<exclusion>
7377
<groupId>org.checkerframework</groupId>
7478
<artifactId>checker-qual</artifactId>

lib/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<springframework4.version>4.3.18</springframework4.version>
141141
<stax2-api.version>4.2.2</stax2-api.version>
142142
<tyrus-standalone-client.version>1.13.1</tyrus-standalone-client.version>
143-
<woodstox.version>6.4.0</woodstox.version>
143+
<woodstox.version>7.1.1</woodstox.version>
144144
<xerces.version>2.12.2</xerces.version>
145145
<xml-apis-ext.version>1.3.04</xml-apis-ext.version>
146146
<xmlunit.version>1.5</xmlunit.version>
@@ -819,6 +819,11 @@
819819
<artifactId>jsoup</artifactId>
820820
<version>${jsoup.version}</version>
821821
</dependency>
822+
<dependency>
823+
<groupId>com.fasterxml.woodstox</groupId>
824+
<artifactId>woodstox-core</artifactId>
825+
<version>${woodstox.version}</version>
826+
</dependency>
822827
</dependencies>
823828
</dependencyManagement>
824829

plugins/engines/beam/src/assembly/assembly.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@
154154
<exclude>com.google.code.gson:gson:jar</exclude>
155155
<exclude>org.apache.commons:commons-collections4:jar</exclude>
156156
<exclude>org.jspecify:jspecify:jar</exclude>
157+
<exclude>org.apache.commons:commons-lang3:jar</exclude>
158+
<exclude>commons-collections:commons-collections:jar</exclude>
159+
<exclude>com.fasterxml.woodstox:woodstox-core:jar</exclude>
157160
</excludes>
158161
<outputDirectory>lib/beam</outputDirectory>
159162
</dependencySet>
@@ -252,6 +255,9 @@
252255
<include>io.confluent::jar</include>
253256
<include>com.google.code.gson:gson:jar</include>
254257
<include>org.apache.commons:commons-collections4:jar</include>
258+
<include>org.apache.commons:commons-lang3:jar</include>
259+
<include>commons-collections:commons-collections:jar</include>
260+
<include>com.fasterxml.woodstox:woodstox-core:jar</include>
255261
</includes>
256262
<outputDirectory>lib/core</outputDirectory>
257263
</dependencySet>

plugins/tech/neo4j/src/assembly/assembly.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<excludes>
5252
<exclude>org.apache.hop:hop-tech-neo4j:jar</exclude>
5353
<exclude>org.reactivestreams:reactive-streams:jar</exclude>
54+
<exclude>io.projectreactor:reactor-core:jar</exclude>
5455
<exclude>io.netty::jar</exclude>
5556
</excludes>
5657
<outputDirectory>plugins/tech/neo4j/lib</outputDirectory>
@@ -59,6 +60,7 @@
5960
<scope>runtime</scope>
6061
<includes>
6162
<include>org.reactivestreams:reactive-streams:jar</include>
63+
<include>io.projectreactor:reactor-core:jar</include>
6264
<include>io.netty::jar</include>
6365
</includes>
6466
<outputDirectory>lib/core</outputDirectory>

plugins/tech/parquet/pom.xml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<name>Hop Plugins Technology Parquet</name>
3030

3131
<properties>
32-
<parquet.version>1.15.2</parquet.version>
32+
<parquet.version>1.16.0</parquet.version>
3333
</properties>
3434

3535
<dependencyManagement>
@@ -45,6 +45,10 @@
4545
</dependencyManagement>
4646

4747
<dependencies>
48+
<dependency>
49+
<groupId>com.fasterxml.woodstox</groupId>
50+
<artifactId>woodstox-core</artifactId>
51+
</dependency>
4852
<dependency>
4953
<groupId>org.apache.hadoop</groupId>
5054
<artifactId>hadoop-client</artifactId>
@@ -105,20 +109,5 @@
105109
</exclusion>
106110
</exclusions>
107111
</dependency>
108-
<dependency>
109-
<groupId>org.apache.parquet</groupId>
110-
<artifactId>parquet-format-structures</artifactId>
111-
<version>${parquet.version}</version>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.apache.commons</groupId>
115-
<artifactId>commons-lang3</artifactId>
116-
<scope>provided</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.apache.commons</groupId>
120-
<artifactId>commons-math3</artifactId>
121-
<scope>provided</scope>
122-
</dependency>
123112
</dependencies>
124113
</project>

plugins/tech/parquet/src/assembly/assembly.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@
4848
<dependencySet>
4949
<scope>runtime</scope>
5050
<excludes>
51-
<exclude>
52-
org.apache.hop:hop-tech-parquet:jar
53-
</exclude>
51+
<exclude>org.apache.hop:hop-tech-parquet:jar</exclude>
52+
<exclude>com.fasterxml.woodstox:woodstox-core:jar</exclude>
5453
</excludes>
5554
<includes>
5655
<include>org.apache.parquet:*:jar</include>
56+
<include>org.locationtech.jts:jts-core:jar</include>
5757
</includes>
5858
<outputDirectory>plugins/tech/parquet/lib</outputDirectory>
5959
</dependencySet>
@@ -62,6 +62,7 @@
6262
<includes>
6363
<include>org.apache.hadoop:*:jar</include>
6464
<include>org.apache.hadoop.thirdparty:*:jar</include>
65+
<include>com.fasterxml.woodstox:woodstox-core:jar</include>
6566
</includes>
6667
<outputDirectory>lib/core</outputDirectory>
6768
</dependencySet>

0 commit comments

Comments
 (0)