From 9226a35cfcbb2297e8dd3102b5c64e18e4e0923b Mon Sep 17 00:00:00 2001
From: Marco Pfatschbacher <marco@graylog.com>
Date: Wed, 3 May 2023 14:46:10 +0200
Subject: [PATCH] Move zstd dependency into the server

We only had this as an enterprise dependency.
The server could use it through a transititive dependency of
kafka-client. This however was version 1.4.5-6

which has an issue on M1 Macs: https://github.com/luben/zstd-jni/issues/153
---
 graylog-project-parent/pom.xml | 5 +++++
 graylog2-server/pom.xml        | 4 ++++
 pom.xml                        | 1 +
 3 files changed, 10 insertions(+)

diff --git a/graylog-project-parent/pom.xml b/graylog-project-parent/pom.xml
index f57ef1ffc315..c9953871ae73 100644
--- a/graylog-project-parent/pom.xml
+++ b/graylog-project-parent/pom.xml
@@ -342,6 +342,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.github.luben</groupId>
+                <artifactId>zstd-jni</artifactId>
+                <version>${zstd.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.rabbitmq</groupId>
diff --git a/graylog2-server/pom.xml b/graylog2-server/pom.xml
index 380ef010289e..2bdd3f58a9f9 100644
--- a/graylog2-server/pom.xml
+++ b/graylog2-server/pom.xml
@@ -588,6 +588,10 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.luben</groupId>
+            <artifactId>zstd-jni</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.github.zafarkhaja</groupId>
diff --git a/pom.xml b/pom.xml
index 9bd309bfbbd4..270f05673342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,6 +169,7 @@
         <validation-api.version>2.0.1.Final</validation-api.version>
         <zkclient.version>0.11</zkclient.version>
         <zookeeper.version>3.5.7</zookeeper.version>
+        <zstd.version>1.5.4-1</zstd.version>
         <cron-utils.version>9.1.6</cron-utils.version>
         <asciitable.version>0.3.2</asciitable.version>
         <commons-net.version>3.6</commons-net.version>