You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/09/30 10:40:05 UTC
[incubator-hop] branch master updated: HOP-3333 : Fat jar zip64
format causes problems with Spring Boot framework
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 1a10b76 HOP-3333 : Fat jar zip64 format causes problems with Spring Boot framework
new 872269a Merge pull request #1096 from mattcasters/master
1a10b76 is described below
commit 1a10b766a1824fd7fcad12130f22796d7172f43a
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Thu Sep 30 12:14:54 2021 +0200
HOP-3333 : Fat jar zip64 format causes problems with Spring Boot framework
---
.../java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java b/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java
index 574bebe..ed8bb47 100644
--- a/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java
+++ b/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,7 @@ import org.jboss.jandex.Indexer;
import java.io.*;
import java.util.*;
+import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipInputStream;
@@ -71,8 +72,8 @@ public class FatJarBuilder {
try {
byte[] buffer = new byte[1024];
- ZipOutputStream zipOutputStream =
- new ZipOutputStream(new FileOutputStream(realTargetJarFile));
+ JarOutputStream zipOutputStream =
+ new JarOutputStream(new FileOutputStream(realTargetJarFile));
for (String jarFile : jarFiles) {