Bump and match pulsar to 2.8.0.7 (#72)

streamnative · Jul 27, 2021 · e58cfbd · e58cfbd
1 parent 29a27f7
commit e58cfbd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - master
+      - branch-*
   push:
     branches:
       - master
+      - branch-*
 
 jobs:
   build:

diff --git a/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/MQTTProtocolHandler.java b/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/MQTTProtocolHandler.java
@@ -100,7 +100,7 @@ public void start(BrokerService brokerService) {
             proxyConfig.setMqttHeartBeat(mqttConfig.getHeartBeat());
             proxyConfig.setMqttProxyPort(mqttConfig.getMqttProxyPort());
             proxyConfig.setBrokerServiceURL("pulsar://"
-                    + ServiceConfigurationUtils.getAppliedAdvertisedAddress(mqttConfig)
+                    + ServiceConfigurationUtils.getAppliedAdvertisedAddress(mqttConfig, true)
                     + ":" + mqttConfig.getBrokerServicePort().get());
             proxyConfig.setMqttAuthenticationEnabled(mqttConfig.isMqttAuthenticationEnabled());
             proxyConfig.setMqttAuthenticationMethods(mqttConfig.getMqttAuthenticationMethods());

diff --git a/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/support/MQTTConsumer.java b/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/support/MQTTConsumer.java
@@ -60,7 +60,7 @@ public MQTTConsumer(Subscription subscription, String mqttTopicName, String puls
                         OutstandingPacketContainer outstandingPacketContainer)
             throws BrokerServiceException {
         super(subscription, CommandSubscribe.SubType.Shared, pulsarTopicName, 0, 0, consumerName, 0, cnx,
-                "", null, false, CommandSubscribe.InitialPosition.Latest, null);
+                "", null, false, CommandSubscribe.InitialPosition.Latest, null, null);
         this.pulsarTopicName = pulsarTopicName;
         this.mqttTopicName = mqttTopicName;
         this.cnx = cnx;

diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
         <mockito.version>2.22.0</mockito.version>
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
-        <pulsar.version>2.8.0</pulsar.version>
+        <pulsar.version>2.8.0.7</pulsar.version>
         <mqtt.codec.version>4.1.66.Final</mqtt.codec.version>
         <log4j2.version>2.13.3</log4j2.version>
         <lombok.version>1.18.4</lombok.version>
@@ -66,7 +66,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.pulsar</groupId>
+            <groupId>io.streamnative</groupId>
             <artifactId>pulsar-broker</artifactId>
             <version>${pulsar.version}</version>
             <scope>provided</scope>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -35,13 +35,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.pulsar</groupId>
+            <groupId>io.streamnative</groupId>
             <artifactId>testmocks</artifactId>
             <version>${pulsar.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.pulsar</groupId>
+            <groupId>io.streamnative</groupId>
             <artifactId>pulsar-broker</artifactId>
             <version>${pulsar.version}</version>
             <type>test-jar</type>