Skip to content

Use SN bom #1433

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

Merged
gaoran10 merged 4 commits into from
Jan 14, 2025
Merged

Use SN bom #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cac4aa
Support sn bom
yaalsn Nov 20, 2024
5626e68
Add github maven package
yaalsn Nov 20, 2024
910d32b
Add test related dependencies
yaalsn Nov 20, 2024
6bd3ae1
Add jar instead of nar package to image
yaalsn Jan 13, 2025
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
5 changes: 5 additions & 0 deletions .github/workflows/pr-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ jobs:
docker rmi $(docker images -q) -f
df -h

- name: Configure Maven Settings
uses: s4u/[email protected]
with:
servers: '[{"id": "github", "username": "streamnativebot", "password": "${{ secrets.SNBOT_GITHUB_TOKEN }}"}]'

- name: License check
run: mvn license:check

Expand Down
12 changes: 1 addition & 11 deletions amqp-client-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,6 @@
<artifactId>amqp-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>${jjwt.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>${jjwt.version}</version>
<scope>runtime</scope>
</dependency>

</dependencies>
</project>
15 changes: 12 additions & 3 deletions amqp-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,21 @@

<!-- include the dependencies -->
<dependencies>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-core</artifactId>
<version>${qpid-protocol-plugin.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -51,7 +61,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId>
<version>${qpid-protocol-plugin.version}</version>
</dependency>

<dependency>
Expand Down
74 changes: 16 additions & 58 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@
<project.compiler.release>${maven.compiler.target}</project.compiler.release>

<!-- dependencies -->
<pulsar.version>4.0.0-ursa-10-SNAPSHOT</pulsar.version>
<pulsar.version>4.1.0-SNAPSHOT</pulsar.version>
<qpid-protocol-plugin.version>8.0.0</qpid-protocol-plugin.version>
<rabbitmq.version>5.8.0</rabbitmq.version>
<sn.bom.verison>4.1.0-SNAPSHOT</sn.bom.verison>

<!-- test dependencies -->
<qpid-client-version>6.4.0</qpid-client-version>
Expand All @@ -51,6 +52,7 @@
<testng.version>6.14.3</testng.version>
<awaitility.version>4.2.0</awaitility.version>
<assertj.version>3.15.0</assertj.version>
<mockito.version>5.12.0</mockito.version>

<!-- plugin dependencies -->
<spotbugs-annotations.version>3.1.8</spotbugs-annotations.version>
Expand Down Expand Up @@ -82,56 +84,19 @@
<!-- dependency definitions -->
<dependencyManagement>
<dependencies>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar</artifactId>
<version>${pulsar.version}</version>
<type>pom</type>
<artifactId>streamnative-bom</artifactId>
<version>4.1.0-SNAPSHOT</version>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
<type>test-jar</type>
<type>pom</type>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>testmocks</artifactId>
<version>${pulsar.version}</version>
</dependency>

<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>${rabbitmq.version}</version>
</dependency>

<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
<version>${qpid-client-version}</version>
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo-jms-version}</version>
</dependency>

<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-test-utils</artifactId>
<version>${qpid-protocol-plugin.version}</version>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -165,40 +130,30 @@
</dependency>

<!-- dependencies for tests -->
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>testmocks</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -282,7 +237,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine> -Xmx2G
<argLine>-Xmx2G
-Dpulsar.allocator.pooled=false
-Dpulsar.allocator.leak_detection=Advanced
-Dlog4j.configurationFile="log4j2.xml"
Expand Down Expand Up @@ -385,8 +340,11 @@
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/repositories/0/content</url>
<id>github</id>
<url>https://maven.pkg.github.com/streamnative/streamnative-bom</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ ASSETS_DIR=release
mkdir $ASSETS_DIR

mvn clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3
mv amqp-impl/target/pulsar-protocol-handler-amqp-*.nar ./$ASSETS_DIR
mv amqp-impl/target/pulsar-protocol-handler-amqp-*.jar ./$ASSETS_DIR/amqp-impl/target/pulsar-protocol-handler-amqp-"${version}".nar
cp README.md ./$ASSETS_DIR/pulsar-protocol-handler-amqp-readme.md
13 changes: 13 additions & 0 deletions tests-qpid-jms-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
<name>StreamNative :: Pulsar Protocol Handler :: AoP Qpid-JMS Client Tests</name>

<dependencies>
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>io.streamnative.pulsar.handlers</groupId>
Expand All @@ -36,6 +44,11 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-core</artifactId>
<scope>test</scope>
</dependency>
<!-- jms test -->
<dependency>
<groupId>org.apache.qpid</groupId>
Expand Down
14 changes: 14 additions & 0 deletions tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,20 @@
<description>Tests for AMQP on Pulsar</description>

<dependencies>
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<scope>test</scope>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>io.streamnative.pulsar.handlers</groupId>
Expand Down
Loading