diff --git a/mqtt-broker/pom.xml b/mqtt-broker/pom.xml index 6e93eb65..80d60418 100644 --- a/mqtt-broker/pom.xml +++ b/mqtt-broker/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-mqtt-parent io.streamnative.pulsar.handlers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 pulsar-protocol-handler-mqtt diff --git a/mqtt-common/pom.xml b/mqtt-common/pom.xml index d1ef745e..553bd159 100644 --- a/mqtt-common/pom.xml +++ b/mqtt-common/pom.xml @@ -20,8 +20,43 @@ pulsar-protocol-handler-mqtt-parent io.streamnative.pulsar.handlers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 pulsar-protocol-handler-mqtt-common - \ No newline at end of file + + + + io.streamnative + pulsar-client-original + + + io.streamnative + bookkeeper-common + + + com.google.guava + guava + + + commons-codec + commons-codec + + + org.apache.commons + commons-collections4 + + + javax.validation + validation-api + + + com.github.ben-manes.caffeine + caffeine + + + org.conscrypt + conscrypt-openjdk-uber + + + diff --git a/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java b/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java index efd7b3c5..211b4b5e 100644 --- a/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java +++ b/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java @@ -30,7 +30,6 @@ import java.util.function.Consumer; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.apache.pulsar.jetcd.shaded.io.vertx.core.impl.ConcurrentHashSet; /** * Proxy connection manager. @@ -40,7 +39,7 @@ public class MQTTConnectionManager { private final ConcurrentMap localConnections; - private final ConcurrentHashSet eventClientIds; + private final Set eventClientIds; @Getter private static final HashedWheelTimer sessionExpireInterval = @@ -58,7 +57,7 @@ public class MQTTConnectionManager { public MQTTConnectionManager(String advertisedAddress) { this.advertisedAddress = advertisedAddress; this.localConnections = new ConcurrentHashMap<>(2048); - this.eventClientIds = new ConcurrentHashSet<>(2048); + this.eventClientIds = ConcurrentHashMap.newKeySet(2048); this.connectListener = new ConnectEventListener(); this.disconnectListener = new DisconnectEventListener(); } diff --git a/mqtt-proxy/pom.xml b/mqtt-proxy/pom.xml index 80706090..11ca678c 100644 --- a/mqtt-proxy/pom.xml +++ b/mqtt-proxy/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-mqtt-parent io.streamnative.pulsar.handlers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 pulsar-protocol-handler-mqtt-proxy @@ -32,6 +32,46 @@ pulsar-protocol-handler-mqtt-common ${project.version} + + io.prometheus + simpleclient + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + + + org.glassfish.jersey.core + jersey-server + + + org.glassfish.jersey.containers + jersey-container-servlet-core + + + org.glassfish.jersey.media + jersey-media-multipart + + + io.swagger + swagger-annotations + + + javax.ws.rs + javax.ws.rs-api + + + javax.servlet + javax.servlet-api + + + com.google.protobuf + protobuf-java + @@ -55,4 +95,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 500f4e08..1e146d67 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> io.streamnative.pulsar.handlers pulsar-protocol-handler-mqtt-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT StreamNative :: Pulsar Protocol Handler :: MoP Parent Parent for MQTT on Pulsar implemented using Pulsar Protocol Handler. @@ -51,8 +51,8 @@ 2.22.0 6.14.3 4.0.2 - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT + 4.3.0-SNAPSHOT 2.18.0 1.16 1.2.2 @@ -72,6 +72,21 @@ 3.1.8 0.8.7 1.56.0 + 3.19.0 + 2.0.17 + 4.17.3.1 + 1.20.0 + 4.5.0 + 2.0.1.Final + 3.2.3 + 2.5.2 + 0.16.0 + 12.1.6 + 2.42 + 1.6.15 + 2.1.1 + 4.0.1 + 3.25.5 @@ -131,6 +146,16 @@ opentelemetry-sdk-extension-autoconfigure-spi ${opentelemetry.version} + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + @@ -142,6 +167,86 @@ pom import + + io.streamnative + bookkeeper-common + ${bookkeeper-common.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + + + javax.validation + validation-api + ${validation-api.version} + + + com.github.ben-manes.caffeine + caffeine + ${caffeine.version} + + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + + + io.prometheus + simpleclient + ${simpleclient.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + ${jetty.version} + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey.version} + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + + + javax.servlet + javax.servlet-api + ${javax.servlet.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + diff --git a/tests/pom.xml b/tests/pom.xml index d2ef8e74..7779b2b0 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-mqtt-parent io.streamnative.pulsar.handlers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 pulsar-protocol-handler-mqtt-tests