This is an automated email from the ASF dual-hosted git repository.
hjf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new ceecc78 [doc] fix doc after remove bc-shaded (#7454)
ceecc78 is described below
commit ceecc780de5dd8e72c51ecaa4eeb0691d49cf91a
Author: Jia Zhai <[email protected]>
AuthorDate: Mon Jul 6 18:42:42 2020 -0500
[doc] fix doc after remove bc-shaded (#7454)
* fix bc doc after remove bc-shaded
* Update site2/docs/security-bouncy-castle.md
Co-authored-by: Yu Liu <[email protected]>
Co-authored-by: Sijie Guo <[email protected]>
Co-authored-by: Yu Liu <[email protected]>
---
site2/docs/security-bouncy-castle.md | 8 +++-----
.../versioned_docs/version-2.5.1/security-bouncy-castle.md | 7 +++----
.../versioned_docs/version-2.5.2/security-bouncy-castle.md | 7 +++----
.../versioned_docs/version-2.6.0/security-bouncy-castle.md | 7 +++----
.../versioned_docs/version-2.6.1/security-bouncy-castle.md | 7 +++----
5 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/site2/docs/security-bouncy-castle.md
b/site2/docs/security-bouncy-castle.md
index e2d2a5d..2d9ef6b 100644
--- a/site2/docs/security-bouncy-castle.md
+++ b/site2/docs/security-bouncy-castle.md
@@ -37,8 +37,7 @@ Pulsar module `bouncy-castle-bc`, which defined by
`bouncy-castle/bc/pom.xml` co
</dependency>
```
-And based on Pulsar module `bouncy-castle-bc`, Pulsar shades a fat jar in
module `bouncy-castle-bc-shaded` that contains needed classes of BouncyCastle
non-FIPS jars.
-By using this `bouncy-castle-bc-shaded` module, user can easily include and
exclude BouncyCastle non-FIPS jars.
+By using this `bouncy-castle-bc` module, you can easily include and exclude
BouncyCastle non-FIPS jars.
### Pulsar Client and Broker dependencies on BC-non-FIPS
@@ -47,7 +46,7 @@ Pulsar Client(`pulsar-client-original`) module include
BouncyCastle non-FIPS jar
```xml
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
<version>${project.parent.version}</version>
</dependency>
```
@@ -95,7 +94,7 @@ For example:
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -118,4 +117,3 @@ Besides this, module `bouncy-castle-bcfips` builds contain
an output with format
For more example, you can reference module `bcfips-include-test` and
`bcfips-nar-test`.
-
diff --git
a/site2/website/versioned_docs/version-2.5.1/security-bouncy-castle.md
b/site2/website/versioned_docs/version-2.5.1/security-bouncy-castle.md
index 59965b6..b8b8d56 100644
--- a/site2/website/versioned_docs/version-2.5.1/security-bouncy-castle.md
+++ b/site2/website/versioned_docs/version-2.5.1/security-bouncy-castle.md
@@ -38,8 +38,7 @@ Pulsar module `bouncy-castle-bc`, which defined by
`bouncy-castle/bc/pom.xml` co
</dependency>
```
-And based on Pulsar module `bouncy-castle-bc`, Pulsar shades a fat jar in
module `bouncy-castle-bc-shaded` that contains needed classes of BouncyCastle
non-FIPS jars.
-By using this `bouncy-castle-bc-shaded` module, user can easily include and
exclude BouncyCastle non-FIPS jars.
+By using this `bouncy-castle-bc` module, user can easily include and exclude
BouncyCastle non-FIPS jars.
### Pulsar Client and Broker dependencies on BC-non-FIPS
@@ -48,7 +47,7 @@ Pulsar Client(`pulsar-client-original`) module include
BouncyCastle non-FIPS jar
```xml
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
<version>${project.parent.version}</version>
</dependency>
```
@@ -96,7 +95,7 @@ For example:
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/site2/website/versioned_docs/version-2.5.2/security-bouncy-castle.md
b/site2/website/versioned_docs/version-2.5.2/security-bouncy-castle.md
index 147eefc..aea6d01 100644
--- a/site2/website/versioned_docs/version-2.5.2/security-bouncy-castle.md
+++ b/site2/website/versioned_docs/version-2.5.2/security-bouncy-castle.md
@@ -38,8 +38,7 @@ Pulsar module `bouncy-castle-bc`, which defined by
`bouncy-castle/bc/pom.xml` co
</dependency>
```
-And based on Pulsar module `bouncy-castle-bc`, Pulsar shades a fat jar in
module `bouncy-castle-bc-shaded` that contains needed classes of BouncyCastle
non-FIPS jars.
-By using this `bouncy-castle-bc-shaded` module, user can easily include and
exclude BouncyCastle non-FIPS jars.
+By using this `bouncy-castle-bc` module, user can easily include and exclude
BouncyCastle non-FIPS jars.
### Pulsar Client and Broker dependencies on BC-non-FIPS
@@ -48,7 +47,7 @@ Pulsar Client(`pulsar-client-original`) module include
BouncyCastle non-FIPS jar
```xml
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
<version>${project.parent.version}</version>
</dependency>
```
@@ -96,7 +95,7 @@ For example:
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/site2/website/versioned_docs/version-2.6.0/security-bouncy-castle.md
b/site2/website/versioned_docs/version-2.6.0/security-bouncy-castle.md
index 8a2d374..400c4f7 100644
--- a/site2/website/versioned_docs/version-2.6.0/security-bouncy-castle.md
+++ b/site2/website/versioned_docs/version-2.6.0/security-bouncy-castle.md
@@ -38,8 +38,7 @@ Pulsar module `bouncy-castle-bc`, which defined by
`bouncy-castle/bc/pom.xml` co
</dependency>
```
-And based on Pulsar module `bouncy-castle-bc`, Pulsar shades a fat jar in
module `bouncy-castle-bc-shaded` that contains needed classes of BouncyCastle
non-FIPS jars.
-By using this `bouncy-castle-bc-shaded` module, user can easily include and
exclude BouncyCastle non-FIPS jars.
+By using this `bouncy-castle-bc` module, user can easily include and exclude
BouncyCastle non-FIPS jars.
### Pulsar Client and Broker dependencies on BC-non-FIPS
@@ -48,7 +47,7 @@ Pulsar Client(`pulsar-client-original`) module include
BouncyCastle non-FIPS jar
```xml
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
<version>${project.parent.version}</version>
</dependency>
```
@@ -96,7 +95,7 @@ For example:
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/site2/website/versioned_docs/version-2.6.1/security-bouncy-castle.md
b/site2/website/versioned_docs/version-2.6.1/security-bouncy-castle.md
index 15cdb6b..e017705 100644
--- a/site2/website/versioned_docs/version-2.6.1/security-bouncy-castle.md
+++ b/site2/website/versioned_docs/version-2.6.1/security-bouncy-castle.md
@@ -38,8 +38,7 @@ Pulsar module `bouncy-castle-bc`, which defined by
`bouncy-castle/bc/pom.xml` co
</dependency>
```
-And based on Pulsar module `bouncy-castle-bc`, Pulsar shades a fat jar in
module `bouncy-castle-bc-shaded` that contains needed classes of BouncyCastle
non-FIPS jars.
-By using this `bouncy-castle-bc-shaded` module, user can easily include and
exclude BouncyCastle non-FIPS jars.
+By using this `bouncy-castle-bc` module, user can easily include and exclude
BouncyCastle non-FIPS jars.
### Pulsar Client and Broker dependencies on BC-non-FIPS
@@ -48,7 +47,7 @@ Pulsar Client(`pulsar-client-original`) module include
BouncyCastle non-FIPS jar
```xml
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
<version>${project.parent.version}</version>
</dependency>
```
@@ -96,7 +95,7 @@ For example:
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
- <artifactId>bouncy-castle-bc-shaded</artifactId>
+ <artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
</dependency>
