Remove bouncycastle shaded (#551)

* Fix bouncycastle scope * Fix bouncycastle scope
polarismesh · Aug 29, 2024 · b5ef058 · b5ef058
1 parent 92a4ade
commit b5ef058
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15to18</artifactId>
-            <version>1.78.1</version>
+            <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>com.tencent.polaris</groupId>

diff --git 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>