fix licence, fix error brings in apache#7640

jiazhai · Oct 21, 2020 · 264ac78 · 264ac78
1 parent 9ced015
commit 264ac78
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 20 deletions.
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
@@ -40,6 +40,14 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-discovery-service</artifactId>

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -585,9 +585,9 @@ Creative Commons Attribution License
 
 Bouncy Castle License
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
-    - org.bouncycastle-bcpkix-jdk15on-1.60.jar
-    - org.bouncycastle-bcprov-ext-jdk15on-1.60.jar
-    - org.bouncycastle-bcprov-jdk15on-1.60.jar
+    - org.bouncycastle-bcpkix-jdk15on-1.66.jar
+    - org.bouncycastle-bcprov-ext-jdk15on-1.66.jar
+    - org.bouncycastle-bcprov-jdk15on-1.66.jar
 
 ------------------------
 

diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
@@ -77,6 +77,14 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-discovery-service</artifactId>
@@ -333,13 +341,6 @@
 
     <!-- transaction related dependencies (end) -->
 
-     <dependency>
-       <groupId>org.bouncycastle</groupId>
-       <artifactId>bc-fips</artifactId>
-       <version>${bouncycastlefips.version}</version>
-       <scope>test</scope>
-     </dependency>
-
   </dependencies>
 
   <build>

diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
@@ -49,6 +49,13 @@
       <version>${project.parent.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.parent.version}</version>
+      <classifier>pkg</classifier>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/pulsar-client-messagecrypto-bc/pom.xml b/pulsar-client-messagecrypto-bc/pom.xml
@@ -46,6 +46,7 @@
       <artifactId>bouncy-castle-bc</artifactId>
       <version>${project.parent.version}</version>
       <classifier>pkg</classifier>
+      <optional>true</optional>
     </dependency>
 
   </dependencies>

diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
@@ -44,6 +44,13 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
@@ -56,6 +56,7 @@
       <artifactId>bouncy-castle-bc</artifactId>
       <version>${project.parent.version}</version>
       <classifier>pkg</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>

diff --git a/pulsar-discovery-service/pom.xml b/pulsar-discovery-service/pom.xml
@@ -67,6 +67,7 @@
       <artifactId>bouncy-castle-bc</artifactId>
       <version>${project.version}</version>
       <classifier>pkg</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -134,13 +135,6 @@
       <artifactId>javax.activation</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bc-fips</artifactId>
-      <version>${bouncycastlefips.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
@@ -561,7 +561,7 @@ Creative Commons Attribution License
 
 Bouncy Castle License
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
-    - bcpkix-jdk15on-1.60.jar
-    - bcprov-ext-jdk15on-1.60.jar
-    - bcprov-jdk15on-1.60.jar
+    - bcpkix-jdk15on-1.66.jar
+    - bcprov-ext-jdk15on-1.66.jar
+    - bcprov-jdk15on-1.66.jar
     - bouncy-castle-bc-2.7.0-SNAPSHOT-pkg.jar
diff --git a/pulsar-testclient/pom.xml b/pulsar-testclient/pom.xml
@@ -63,6 +63,15 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>pulsar-client-messagecrypto-bc</artifactId>
 			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>bouncy-castle-bc</artifactId>
+			<version>${project.version}</version>
+			<classifier>pkg</classifier>
+			<optional>true</optional>
 		</dependency>
 
 		<dependency>