diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 1b52eee4..2c3b47e0 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -34,6 +34,11 @@ jobs: docker rmi $(docker images -q) -f df -h + - name: Configure Maven Settings + uses: s4u/maven-settings-action@v2.7.0 + with: + servers: '[{"id": "github", "username": "streamnativebot", "password": "${{ secrets.SNBOT_GITHUB_TOKEN }}"}]' + - name: License check run: mvn license:check diff --git a/amqp-client-auth/pom.xml b/amqp-client-auth/pom.xml index 62f62c0c..41165c44 100644 --- a/amqp-client-auth/pom.xml +++ b/amqp-client-auth/pom.xml @@ -38,16 +38,6 @@ amqp-client provided - - io.jsonwebtoken - jjwt-api - ${jjwt.version} - - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - runtime - + \ No newline at end of file diff --git a/amqp-impl/pom.xml b/amqp-impl/pom.xml index 59372f15..b4736a62 100644 --- a/amqp-impl/pom.xml +++ b/amqp-impl/pom.xml @@ -31,11 +31,22 @@ - + + io.streamnative + pulsar-broker + provided + + + io.streamnative + pulsar-broker + ${pulsar.version} + test-jar + test + org.apache.qpid qpid-broker-core - ${qpid-protocol-plugin.version} + provided com.fasterxml.jackson.core @@ -51,7 +62,7 @@ org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol - ${qpid-protocol-plugin.version} + provided diff --git a/pom.xml b/pom.xml index bf481ee1..92f3adb0 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,10 @@ ${maven.compiler.target} - 4.0.0-ursa-10-SNAPSHOT + 4.1.0-SNAPSHOT 8.0.0 5.8.0 + 4.1.0-SNAPSHOT 6.4.0 @@ -51,6 +52,7 @@ 6.14.3 4.2.0 3.15.0 + 5.12.0 3.1.8 @@ -82,56 +84,19 @@ - io.streamnative - pulsar - ${pulsar.version} - pom + streamnative-bom + 4.1.0-SNAPSHOT import - - - - io.streamnative - pulsar-broker - ${pulsar.version} - - - - io.streamnative - pulsar-broker - ${pulsar.version} - test-jar + pom io.streamnative testmocks ${pulsar.version} - - - - com.rabbitmq - amqp-client - ${rabbitmq.version} - - - - org.apache.qpid - qpid-client - ${qpid-client-version} - - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${geronimo-jms-version} - - - - org.apache.qpid - qpid-test-utils - ${qpid-protocol-plugin.version} + test @@ -165,40 +130,30 @@ - - io.streamnative - pulsar-broker - test-jar - test - - io.streamnative testmocks test - - org.testng - testng - test - - org.mockito mockito-core + ${mockito.version} test org.awaitility awaitility + ${awaitility.version} test org.assertj assertj-core + ${assertj.version} test @@ -282,7 +237,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - -Xmx2G + -Xmx2G -Dpulsar.allocator.pooled=false -Dpulsar.allocator.leak_detection=Advanced -Dlog4j.configurationFile="log4j2.xml" @@ -385,8 +340,11 @@ https://s01.oss.sonatype.org/content/repositories/snapshots - ossrh - https://s01.oss.sonatype.org/service/local/repositories/0/content + github + https://maven.pkg.github.com/streamnative/streamnative-bom + + true + diff --git a/tests-qpid-jms-client/pom.xml b/tests-qpid-jms-client/pom.xml index 171dd72f..1e95ec8e 100644 --- a/tests-qpid-jms-client/pom.xml +++ b/tests-qpid-jms-client/pom.xml @@ -28,6 +28,14 @@ StreamNative :: Pulsar Protocol Handler :: AoP Qpid-JMS Client Tests + + io.streamnative + pulsar-broker + ${pulsar.version} + test-jar + test + + io.streamnative.pulsar.handlers @@ -36,6 +44,11 @@ test + + org.apache.qpid + qpid-broker-core + test + org.apache.qpid diff --git a/tests/pom.xml b/tests/pom.xml index 7c65723a..95ee1831 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -31,6 +31,20 @@ Tests for AMQP on Pulsar + + io.streamnative + pulsar-broker + ${pulsar.version} + test-jar + test + + + + io.streamnative + pulsar-broker + test + + io.streamnative.pulsar.handlers