diff --git a/dbptk-model/pom.xml b/dbptk-model/pom.xml index 8f21e1e0..84dd8f32 100644 --- a/dbptk-model/pom.xml +++ b/dbptk-model/pom.xml @@ -38,7 +38,7 @@ org.apache.commons commons-compress - 1.21 + 1.26.0 commons-io diff --git a/dbptk-modules/dbptk-module-siard/pom.xml b/dbptk-modules/dbptk-module-siard/pom.xml index 57f7b935..f49ee6c5 100644 --- a/dbptk-modules/dbptk-module-siard/pom.xml +++ b/dbptk-modules/dbptk-module-siard/pom.xml @@ -69,7 +69,7 @@ org.apache.commons commons-compress - 1.21 + 1.26.0 org.mapdb diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ParallelZipWriteStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ParallelZipWriteStrategy.java index 2844d3c9..96397cef 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ParallelZipWriteStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ParallelZipWriteStrategy.java @@ -41,7 +41,7 @@ public ParallelZipWriteStrategy(CompressionMethod compressionMethod) { @Override public OutputStream createOutputStream(SIARDArchiveContainer container, String path) throws ModuleException { - ArchiveEntry archiveEntry = new ZipArchiveEntry(path); + ZipArchiveEntry archiveEntry = new ZipArchiveEntry(path); try { zipOut.putArchiveEntry(archiveEntry); } catch (IOException e) { @@ -72,7 +72,6 @@ public void finish(SIARDArchiveContainer container) throws ModuleException { } } - try { scatterZipCreator.writeTo(zipOut); } catch (IOException | InterruptedException | ExecutionException e) { diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ZipWriteStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ZipWriteStrategy.java index 5375faac..ce28dd23 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ZipWriteStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/write/ZipWriteStrategy.java @@ -38,7 +38,7 @@ public ZipWriteStrategy(CompressionMethod compressionMethod) { @Override public OutputStream createOutputStream(SIARDArchiveContainer container, String path) throws ModuleException { - ArchiveEntry archiveEntry = new ZipArchiveEntry(path); + ZipArchiveEntry archiveEntry = new ZipArchiveEntry(path); try { zipOut.putArchiveEntry(archiveEntry); } catch (IOException e) { diff --git a/pom.xml b/pom.xml index 113305cd..2d66cfbf 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,6 @@ dbptk-model dbptk-bindings dbptk-core - dbptk-bindings dbptk-modules @@ -321,7 +320,7 @@ commons-io commons-io - 2.7 + 2.15.1 org.apache.commons