From 4364399bd454b290851927bc927e1cbd9d36823c Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <132913826+sfc-gh-dprzybysz@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:43:51 +0100
Subject: [PATCH] SNOW-1800995: Merge io.netty.versions.properties during shade
(#1967)
---
FIPS/pom.xml | 4 +++-
pom.xml | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/FIPS/pom.xml b/FIPS/pom.xml
index 13e7db8f4..0b874551d 100644
--- a/FIPS/pom.xml
+++ b/FIPS/pom.xml
@@ -589,7 +589,9 @@
-
+
+
+ META-INF/io.netty.versions.properties
diff --git a/pom.xml b/pom.xml
index 96f2a65b6..2a1cf4ea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1023,6 +1023,9 @@
+
+ META-INF/io.netty.versions.properties
+