diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index a4a33633b2..30f4d33c94 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -149,6 +149,10 @@ org.apache.commons commons-compress + + com.github.luben + zstd-jni + org.apache.commons commons-lang3 @@ -241,10 +245,6 @@ com.github.jponge lzma-java - - com.github.luben - zstd-jni - com.aayushatharva.brotli4j brotli4j diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java index 7c690588cd..a910a4f875 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java @@ -349,8 +349,7 @@ public class CompressContent extends AbstractProcessor { compressionOut = new CompressorStreamFactory().createCompressorOutputStream(compressionFormat.toLowerCase(), bufferedOut); break; case COMPRESSION_FORMAT_ZSTD: - final int zstdcompressionLevel = context.getProperty(COMPRESSION_LEVEL).asInteger() * 2; - compressionOut = new ZstdCompressorOutputStream(bufferedOut, zstdcompressionLevel); + compressionOut = new ZstdCompressorOutputStream(bufferedOut); mimeTypeRef.set("application/zstd"); break; case COMPRESSION_FORMAT_BROTLI: { diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index c43158d31b..e04f155b36 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -105,11 +105,6 @@ lzma-java 1.3 - - com.github.luben - zstd-jni - 1.5.5-6 - com.aayushatharva.brotli4j brotli4j diff --git a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml index 6edaa9d1c1..d3321cf322 100644 --- a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml +++ b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml @@ -31,12 +31,20 @@ ${org.apache.commons.codec.version} provided + org.apache.commons commons-compress ${org.apache.commons.compress.version} provided + + com.github.luben + zstd-jni + ${com.github.luben.zstd-jni.version} + provided + + commons-io commons-io diff --git a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml index 6648212a1a..0ebb74ad8b 100644 --- a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml @@ -39,6 +39,10 @@ org.apache.commons commons-compress + + com.github.luben + zstd-jni + commons-io commons-io diff --git a/pom.xml b/pom.xml index 6f5df0da3a..9772516bc6 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,7 @@ 1.6.0 1.16.1 1.26.1 + 1.5.6-1 2.10.1 3.14.0 3.10.0 @@ -273,6 +274,11 @@ commons-compress ${org.apache.commons.compress.version} + + com.github.luben + zstd-jni + ${com.github.luben.zstd-jni.version} + org.apache.commons commons-configuration2