Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

Commit

Permalink
Release 3.2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
streamnativebot committed Mar 13, 2024
1 parent 8a25a08 commit aa8cbb2
Show file tree
Hide file tree
Showing 226 changed files with 6,967 additions and 8,030 deletions.
10 changes: 5 additions & 5 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -19,8 +19,7 @@
under the License.
-->
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
Expand Down
8 changes: 3 additions & 5 deletions .mvn/gradle-enterprise.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -19,10 +19,8 @@
under the License.
-->
<gradleEnterprise
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
<enabled>#{env['GRADLE_ENTERPRISE_ACCESS_KEY']?.trim() > ''}</enabled>
<gradleEnterprise xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
<enabled>#{env['GRADLE_ENTERPRISE_ACCESS_KEY']?.trim() &gt; ''}</enabled>
<server>
<url>https://ge.apache.org</url>
<allowUntrusted>false</allowUntrusted>
Expand Down
16 changes: 4 additions & 12 deletions bouncy-castle/bc/pom.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -18,44 +19,36 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.pulsar</groupId>
<groupId>io.streamnative</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>3.2.1</version>
<version>3.2.1.1</version>
<relativePath>..</relativePath>
</parent>

<artifactId>bouncy-castle-bc</artifactId>
<name>Apache Pulsar :: Bouncy Castle :: BC</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
</dependencies>

<build>
<plugins>

<!-- build a `jar in jar` to avoid break bc signature-->
<plugin>
<groupId>de.ntcomputer</groupId>
Expand All @@ -73,7 +66,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down
14 changes: 4 additions & 10 deletions bouncy-castle/bcfips-include-test/pom.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -18,28 +19,24 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.pulsar</groupId>
<groupId>io.streamnative</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>3.2.1</version>
<version>3.2.1.1</version>
<relativePath>..</relativePath>
</parent>

<artifactId>bcfips-include-test</artifactId>
<name>Pulsar Bouncy Castle FIPS Test</name>
<description> Broker and client runs auth include BC FIPS verison</description>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>testmocks</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker</artifactId>
Expand All @@ -53,7 +50,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker</artifactId>
Expand All @@ -66,15 +62,13 @@
</exclusions>
<scope>test</scope>
</dependency>

<!--exclude bouncy castle, then load fips version-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bcfips</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
</dependency>

</dependencies>
<build>
<plugins>
Expand Down
14 changes: 4 additions & 10 deletions bouncy-castle/bcfips/pom.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -18,41 +19,34 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.pulsar</groupId>
<groupId>io.streamnative</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>3.2.1</version>
<version>3.2.1.1</version>
<relativePath>..</relativePath>
</parent>

<artifactId>bouncy-castle-bcfips</artifactId>
<name>Apache Pulsar :: Bouncy Castle :: BC-FIPS</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>${bouncycastle.bc-fips.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-fips</artifactId>
<version>${bouncycastle.bcpkix-fips.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<!-- build a `jar in jar` to avoid break bc signature-->
Expand Down
12 changes: 4 additions & 8 deletions bouncy-castle/pom.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -18,17 +19,15 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<parent>
<groupId>org.apache.pulsar</groupId>
<groupId>io.streamnative</groupId>
<artifactId>pulsar</artifactId>
<version>3.2.1</version>
<version>3.2.1.1</version>
<relativePath>..</relativePath>
</parent>

<build>
<pluginManagement>
<plugins>
Expand All @@ -42,16 +41,13 @@
</plugins>
</pluginManagement>
</build>

<artifactId>bouncy-castle-parent</artifactId>
<name>Apache Pulsar :: Bouncy Castle :: Parent</name>

<!--make it easy for user to load Bouncy Castle and Bouncy Castle FIPS-->
<modules>
<!--2 module for nar-->
<module>bc</module>
<module>bcfips</module>

<!--2 module for fips version test-->
<module>bcfips-include-test</module>
</modules>
Expand Down
Loading

0 comments on commit aa8cbb2

Please sign in to comment.