Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update documentations after PR 7453 #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update documentations after PR 7453 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions bouncy-castle/bcfips-include-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,10 @@

<!--exclude bouncy castle, then load fips version-->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>${bouncycastlefips.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-fips</artifactId>
<version>${bouncycastlefips.version}</version>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bcfips</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
</dependency>

</dependencies>
Expand Down
8 changes: 0 additions & 8 deletions distribution/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@
<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>
Expand Down
13 changes: 4 additions & 9 deletions pulsar-broker-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@
<artifactId>pulsar-broker</artifactId>
<version>${project.parent.version}</version>
</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>
Expand Down Expand Up @@ -111,8 +104,6 @@
<include>com.thoughtworks.paranamer:paranamer</include>
<include>org.apache.commons:commons-compress</include>
<include>org.tukaani:xz</include>
<!-- bouncycastle Provider dependencies-->
<include>org.bouncycastle:*</include>
</includes>
</artifactSet>
<filters>
Expand All @@ -121,6 +112,10 @@
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand Down
8 changes: 0 additions & 8 deletions pulsar-broker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@
<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>
Expand Down
4 changes: 4 additions & 0 deletions pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand Down
10 changes: 8 additions & 2 deletions pulsar-client-admin-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@
<include>org.yaml:snakeyaml</include>
<include>io.swagger:*</include>
<include>org.apache.bookkeeper:bookkeeper-common-allocator</include>
<!-- bouncycastle Provider dependencies-->
<include>org.bouncycastle:*</include>
</includes>
</artifactSet>
<filters>
Expand All @@ -102,12 +100,20 @@
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
<filter>
<artifact>org.apache.pulsar:pulsar-client-admin-original</artifact>
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand Down
17 changes: 5 additions & 12 deletions pulsar-client-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,11 @@
<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>
<plugins>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand All @@ -85,8 +77,6 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</artifactItem>
</artifactItems>


</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -162,8 +152,7 @@
<include>org.apache.commons:commons-compress</include>
<include>org.tukaani:xz</include>
<include>org.apache.bookkeeper:bookkeeper-common-allocator</include>
<!-- bouncycastle Provider dependencies-->
<include>org.bouncycastle:*</include>
<!-- Issue #6834, Since Netty ByteBuf shaded, we need also shade this module -->
<include>org.apache.pulsar:pulsar-client-messagecrypto-bc</include>
</includes>
</artifactSet>
Expand All @@ -173,6 +162,10 @@
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand Down
27 changes: 5 additions & 22 deletions pulsar-client-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@
<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>
</dependencies>

Expand Down Expand Up @@ -89,8 +81,6 @@
<outputDirectory>${project.build.directory}/classes/org/asynchttpclient/config</outputDirectory>
</artifactItem>
</artifactItems>


</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -149,27 +139,20 @@
<include>com.thoughtworks.paranamer:paranamer</include>
<include>org.apache.commons:commons-compress</include>
<include>org.tukaani:xz</include>
<!-- bouncycastle Provider dependencies-->
<include>org.bouncycastle:*</include>
<!-- Issue #6834, Since Netty ByteBuf shaded, we need also shade this module -->
<include>org.apache.pulsar:pulsar-client-messagecrypto-bc</include>
</includes>
</artifactSet>
<filters>
<filter>
<!-- Shading signed JARs will fail without
this. http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar -->
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
<filter>
<artifact>org.apache.pulsar:pulsar-client-original</artifact>
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand Down
7 changes: 0 additions & 7 deletions pulsar-client-tools-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
3 changes: 1 addition & 2 deletions pulsar-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,10 @@
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.parent.version}</version>
<classifier>pkg</classifier>
<!-- bc module should not be included in the followed package, or the signature in jar would be wrong -->
<optional>true</optional>
</dependency>

<dependency>
<!-- this module only need by the real client, client inside broker no need this module -->
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-messagecrypto-bc</artifactId>
<version>${project.parent.version}</version>
Expand Down
1 change: 0 additions & 1 deletion pulsar-discovery-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
<optional>true</optional>
</dependency>

<dependency>
Expand Down
18 changes: 7 additions & 11 deletions pulsar-functions/localrun-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
</transformers>
<filters>
<filter>
<!-- Shading signed JARs will fail without
this. http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar -->
<artifact>*:*</artifact>
<artifact>org.apache.pulsar:pulsar-client-original</artifact>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
Expand Down Expand Up @@ -250,10 +250,6 @@
<pattern>jline</pattern>
<shadedPattern>org.apache.pulsar.functions.runtime.shaded.jline</shadedPattern>
</relocation>
<relocation>
<pattern>org.bouncycastle</pattern>
<shadedPattern>org.apache.pulsar.functions.runtime.shaded.org.bouncycastle</shadedPattern>
</relocation>
<relocation>
<pattern>org.xerial.snappy</pattern>
<shadedPattern>org.apache.pulsar.functions.runtime.shaded.org.xerial.snappy</shadedPattern>
Expand Down Expand Up @@ -353,4 +349,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
7 changes: 0 additions & 7 deletions pulsar-functions/worker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-admin-original</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions pulsar-io/debezium/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions pulsar-io/kafka-connect-adaptor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>kafka-connect-avro-converter-shaded</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions pulsar-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,5 @@
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
12 changes: 4 additions & 8 deletions pulsar-sql/presto-pulsar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@
<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>managed-ledger</artifactId>
Expand Down Expand Up @@ -148,6 +140,10 @@
<includes>
<include>**</include>
</includes>
<excludes>
<!-- bouncycastle jars could not be shaded, or the signatures will be wrong-->
<exclude>org/bouncycastle/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand Down
Loading