@@ -248,33 +248,34 @@ under the License.
248248 </artifactItems >
249249 </configuration >
250250 </plugin >
251-
252251 <plugin >
253- <groupId >org.codehaus.mojo</groupId >
254- <artifactId >exec-maven-plugin</artifactId >
255- <version >3.1.0</version >
252+ <artifactId >maven-antrun-plugin</artifactId >
256253 <executions >
257254 <execution >
258255 <id >FLINK-31695</id >
259256 <phase >process-resources</phase >
260257 <goals >
261- <goal >exec </goal >
258+ <goal >run </goal >
262259 </goals >
260+ <configuration >
261+ <!--
262+ Due to FLINK-31695, we need to delete conflicting classes from jar file.
263+ Remove this work-around after we make our own e2e docker image,
264+ with both Flink and Hadoop in the same docker.
265+ -->
266+ <target >
267+ <!-- Unzip the jar file to a temporary directory -->
268+ <unzip src =" /tmp/paimon-e2e-tests-jars/bundled-hadoop.jar" dest =" target/temp" />
269+ <!-- Delete the conflicting file -->
270+ <delete file =" target/temp/org/apache/commons/cli/CommandLine.class" />
271+ <!-- Repackage the modified content -->
272+ <zip destfile =" /tmp/paimon-e2e-tests-jars/bundled-hadoop.jar" basedir =" target/temp" />
273+ <!-- Delete the extracted temporary folder -->
274+ <delete dir =" target/temp" />
275+ </target >
276+ </configuration >
263277 </execution >
264278 </executions >
265- <configuration >
266- <!--
267- Due to FLINK-31695, we need to delete conflicting classes from jar file.
268- Remove this work-around after we make our own e2e docker image,
269- with both Flink and Hadoop in the same docker.
270- -->
271- <executable >zip</executable >
272- <arguments >
273- <argument >-d</argument >
274- <argument >/tmp/paimon-e2e-tests-jars/bundled-hadoop.jar</argument >
275- <argument >org/apache/commons/cli/CommandLine.class</argument >
276- </arguments >
277- </configuration >
278279 </plugin >
279280 </plugins >
280281
0 commit comments