From f2200b6f9b8e0cff402133507a41bac468333e1e Mon Sep 17 00:00:00 2001
From: TomlongTK <longqiang02@maoyan.com>
Date: Thu, 8 Aug 2024 17:26:48 +0800
Subject: [PATCH 1/2] Fix bouncycastle scope

---
 .../configfilefilter-crypto/pom.xml                              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml b/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml
index 9d070d68c..9132b6c6d 100644
--- a/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml
+++ b/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml
@@ -34,6 +34,7 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15to18</artifactId>
             <version>1.78.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.tencent.polaris</groupId>

From 84fd3da1d0def088d347db8579036b9f184f7f40 Mon Sep 17 00:00:00 2001
From: TomlongTK <longqiang02@maoyan.com>
Date: Thu, 8 Aug 2024 18:21:56 +0800
Subject: [PATCH 2/2] Fix bouncycastle scope

---
 polaris-distribution/polaris-all/pom.xml               | 10 ++++++++++
 .../configfilefilter-crypto/pom.xml                    |  3 +--
 pom.xml                                                |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/polaris-distribution/polaris-all/pom.xml b/polaris-distribution/polaris-all/pom.xml
index 5e25fc0d5..60b4aab5a 100644
--- a/polaris-distribution/polaris-all/pom.xml
+++ b/polaris-distribution/polaris-all/pom.xml
@@ -42,6 +42,11 @@
             <version>${javax.annotation.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15to18</artifactId>
+            <version>${bouncycastle.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -166,6 +171,11 @@
                                     <shadedPattern>shade.polaris.io.netty</shadedPattern>
                                 </relocation>
                             </relocations>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.bouncycastle:*</exclude>
+                                </excludes>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml b/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml
index 9132b6c6d..16a5b82b1 100644
--- a/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml
+++ b/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml
@@ -33,8 +33,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15to18</artifactId>
-            <version>1.78.1</version>
-            <scope>provided</scope>
+            <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>com.tencent.polaris</groupId>
diff --git a/pom.xml b/pom.xml
index 0171ff0fb..5efa0e810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,7 @@
         <okhttp.version>2.7.5</okhttp.version>
         <httpclient.version>4.5.14</httpclient.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <bouncycastle.version>1.78.1</bouncycastle.version>
     </properties>
 
     <dependencies>