From a78c1620cd8b8777fda6ae4b50695cd72fb4cbc3 Mon Sep 17 00:00:00 2001
From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com>
Date: Fri, 15 Dec 2023 09:25:26 +0700
Subject: [PATCH] deps: temporarily update boringssl ahead of netty to fix M1
 docker crash (#3650)

temporary until netty includes https://github.com/netty/netty/pull/13724

Fixes https://github.com/openzipkin/zipkin/issues/3532

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 zipkin-server/pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index 6889298930c..76dffdf7bc4 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -146,6 +146,11 @@
           <groupId>javax.validation</groupId>
           <artifactId>validation-api</artifactId>
         </exclusion>
+        <!-- temporary until netty includes https://github.com/netty/netty/pull/13724 -->
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-tcnative-boringssl-static</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -159,6 +164,43 @@
       <version>${armeria.version}</version>
     </dependency>
 
+    <!-- temporary until netty includes https://github.com/netty/netty/pull/13724 -->
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>2.0.62.Final</version>
+      <classifier>linux-x86_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>2.0.62.Final</version>
+      <classifier>linux-aarch_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>2.0.62.Final</version>
+      <classifier>osx-x86_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>2.0.62.Final</version>
+      <classifier>osx-aarch_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>2.0.62.Final</version>
+      <classifier>windows-x86_64</classifier>
+      <scope>runtime</scope>
+    </dependency>
+
     <!--Prometheus metrics-->
     <dependency>
       <groupId>io.micrometer</groupId>