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

Commit

Permalink
Release 2.10.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@streamnativebot
streamnativebot committed Aug 29, 2023
1 parent 810a2f0 commit 68029bd
Show file tree
Hide file tree
Showing 222 changed files with 6,467 additions and 7,427 deletions.
16 changes: 4 additions & 12 deletions bouncy-castle/bc/pom.xml
View file
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>2.10.5</version>
<version>2.10.5.2</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-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</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
View file
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>2.10.5</version>
<version>2.10.5.2</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
View file
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>2.10.5</version>
<version>2.10.5.2</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>${bouncycastlefips.version}</version>
</dependency>

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

<build>
<plugins>
<!-- build a `jar in jar` to avoid break bc signature-->
Expand Down
11 changes: 4 additions & 7 deletions bouncy-castle/pom.xml
View file
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,26 +19,22 @@
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>2.10.5</version>
<version>2.10.5.2</version>
<relativePath>..</relativePath>
</parent>

<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
79 changes: 65 additions & 14 deletions buildtools/pom.xml
View file
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,23 +19,19 @@
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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
<relativePath></relativePath>
<relativePath/>
</parent>

<groupId>org.apache.pulsar</groupId>
<groupId>io.streamnative</groupId>
<artifactId>buildtools</artifactId>
<version>2.10.5</version>
<version>2.10.5.2</version>
<packaging>jar</packaging>
<name>Pulsar Build Tools</name>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand All @@ -50,10 +47,9 @@
<guava.version>32.0.0-jre</guava.version>
<ant.version>1.10.12</ant.version>
<snakeyaml.version>2.0</snakeyaml.version>
<test.additional.args></test.additional.args>
<test.additional.args/>
<mockito.version>3.12.4</mockito.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -65,9 +61,7 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
Expand All @@ -88,7 +82,6 @@
<artifactId>guice</artifactId>
<version>${guice.version}</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down Expand Up @@ -145,7 +138,6 @@
<version>${mockito.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -240,6 +232,55 @@
<excludes>**/proto/*</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>default-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>javadoc</classifier>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<extension>
Expand All @@ -264,4 +305,14 @@
</properties>
</profile>
</profiles>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>
32 changes: 16 additions & 16 deletions buildtools/src/main/resources/log4j2.xml
View file
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 @@ -20,19 +20,19 @@
-->
<Configuration status="INFO">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} %-5level [%t{12}] %c{1.}@%L - %msg %X%n" />
</Console>
</Appenders>
<Loggers>
<Root level="warn">
<AppenderRef ref="Console" />
</Root>
<Logger name="org.eclipse.jetty" level="info"/>
<Logger name="org.apache.pulsar" level="info"/>
<Logger name="org.apache.bookkeeper" level="info"/>
<Logger name="org.apache.kafka" level="info"/>
<Logger name="org.testcontainers" level="info"/>
</Loggers>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} %-5level [%t{12}] %c{1.}@%L - %msg %X%n"/>
</Console>
</Appenders>
<Loggers>
<Root level="warn">
<AppenderRef ref="Console"/>
</Root>
<Logger name="org.eclipse.jetty" level="info"/>
<Logger name="org.apache.pulsar" level="info"/>
<Logger name="org.apache.bookkeeper" level="info"/>
<Logger name="org.apache.kafka" level="info"/>
<Logger name="org.testcontainers" level="info"/>
</Loggers>
</Configuration>
Loading

0 comments on commit 68029bd

Please sign in to comment.