From 67e947dbd48481a9655d5f549e1992e97025c3d1 Mon Sep 17 00:00:00 2001
From: Lishen Yao <yaalsn@gmail.com>
Date: Tue, 14 Jan 2025 11:45:28 +0800
Subject: [PATCH] Use SN bom (#1606)

* Use sn bom

* Add other jars
---
 .github/workflows/pr_test.yml |  5 +++
 pom.xml                       | 77 ++++++++---------------------------
 scripts/build.sh              |  4 +-
 3 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index ef1426bb..2cdb8eeb 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -38,6 +38,11 @@ jobs:
           distribution: 'temurin'
           java-version: 17
 
+      - 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/pom.xml b/pom.xml
index 61d843ff..3f3651a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,9 @@
         <mockito.version>2.22.0</mockito.version>
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
-        <pulsar.version>4.0.0-ursa-5-SNAPSHOT</pulsar.version>
-        <mqtt.codec.version>4.1.94.Final</mqtt.codec.version>
+        <pulsar.version>4.1.0-SNAPSHOT</pulsar.version>
+        <sn.bom.version>4.1.0-SNAPSHOT</sn.bom.version>
+        <mqtt.codec.version>4.1.115.Final</mqtt.codec.version>
         <log4j2.version>2.18.0</log4j2.version>
         <fusesource.client.version>1.16</fusesource.client.version>
         <hivemq.mqtt.client.version>1.2.2</hivemq.mqtt.client.version>
@@ -76,58 +77,20 @@
         <dependency>
             <groupId>io.streamnative</groupId>
             <artifactId>pulsar-broker</artifactId>
-            <version>${pulsar.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-testing</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-auth</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-all</artifactId>
-            <version>${grpc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-mqtt</artifactId>
-            <version>${mqtt.codec.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
             <version>${apache.commons.bean-utils.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -150,24 +113,21 @@
         <dependency>
             <groupId>dev.cel</groupId>
             <artifactId>cel</artifactId>
-            <version>0.5.2</version>
-            <!--  It included in snoidc-broker-common -->
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
-          <dependency>
-            <groupId>com.fasterxml.jackson</groupId>
-            <artifactId>jackson-bom</artifactId>
-            <version>${jackson.version}</version>
-            <scope>import</scope>
-            <type>pom</type>
-          </dependency>
+            <dependency>
+                <groupId>io.streamnative</groupId>
+                <artifactId>streamnative-bom</artifactId>
+                <version>${sn.bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
-  
+
 
     <build>
         <pluginManagement>
@@ -390,16 +350,15 @@
             <url>https://repo1.maven.org/maven2</url>
         </repository>
         <repository>
-            <id>snapshot</id>
+            <id>nexus-snapshot</id>
             <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>
-        </repository>
-        <repository>
-            <id>nexus-snapshot</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/streamnative/streamnative-bom</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>
     <distributionManagement>
diff --git a/scripts/build.sh b/scripts/build.sh
index 212eb97b..a3968553 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -28,5 +28,7 @@ ASSETS_DIR=release
 mkdir $ASSETS_DIR
 
 mvn clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3
-mv mqtt-broker/target/pulsar-protocol-handler-mqtt-*.nar  ./$ASSETS_DIR
+mv mqtt-broker/target/pulsar-protocol-handler-mqtt-*.jar ./$ASSETS_DIR/pulsar-protocol-handle
+mv mqtt-common/target/pulsar-protocol-handler-mqtt-common-*.jar ./$ASSETS_DIR/
+mv mqtt-proxy/target/pulsar-protocol-handler-mqtt-proxy-*.jar ./$ASSETS_DIR/
 cp README.md ./$ASSETS_DIR/pulsar-protocol-handler-mqtt-readme.md
\ No newline at end of file