Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-12996 Moved zstd-jni to standard-shared-nar 

- zstd-jni must be present in the same NAR as commons-compress

This closes #8598

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Joseph Witt 2024-04-03 16:32:40 -07:00 committed by exceptionfactory
parent 3a03caa149
commit 98c4061cfe
No known key found for this signature in database
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
View File

@ -149,6 +149,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@ -241,10 +245,6 @@
<groupId>com.github.jponge</groupId>
<artifactId>lzma-java</artifactId>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
</dependency>
<dependency>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j</artifactId>

3
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
View File

@ -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: {

5
nifi-nar-bundles/nifi-standard-bundle/pom.xml
View File

@ -105,11 +105,6 @@
<artifactId>lzma-java</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.5-6</version>
</dependency>
<dependency>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j</artifactId>

8
nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
View File

@ -31,12 +31,20 @@
<version>${org.apache.commons.codec.version}</version>
<scope>provided</scope>
</dependency>
<!-- Commons compress and associated 'optional' dependencies we require -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${org.apache.commons.compress.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>${com.github.luben.zstd-jni.version}</version>
<scope>provided</scope>
</dependency>
<!-- end commons compress dependencies -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>

4
nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml
View File

@ -39,6 +39,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>

6
pom.xml
View File

@ -118,6 +118,7 @@
<org.apache.commons.cli.version>1.6.0</org.apache.commons.cli.version>
<org.apache.commons.codec.version>1.16.1</org.apache.commons.codec.version>
<org.apache.commons.compress.version>1.26.1</org.apache.commons.compress.version>
<com.github.luben.zstd-jni.version>1.5.6-1</com.github.luben.zstd-jni.version>
<org.apache.commons.configuration.version>2.10.1</org.apache.commons.configuration.version>
<org.apache.commons.lang3.version>3.14.0</org.apache.commons.lang3.version>
<org.apache.commons.net.version>3.10.0</org.apache.commons.net.version>
@ -273,6 +274,11 @@
<artifactId>commons-compress</artifactId>
<version>${org.apache.commons.compress.version}</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>${com.github.luben.zstd-jni.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>