Skip to content

Commit 0951a35

Browse files
streamnativebotstreamnativebot
authored
Bump mop version to 4.3.0-SNAPSHOT (#2065)
1 parent 51d6267 commit 0951a35

6 files changed

Lines changed: 105 additions & 20 deletions

File tree

‎mqtt-broker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
2222
<groupId>io.streamnative.pulsar.handlers</groupId>
23-
<version>4.2.0-SNAPSHOT</version>
23+
<version>4.3.0-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>pulsar-protocol-handler-mqtt</artifactId>

‎mqtt-common/pom.xml‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,45 @@
2020
<parent>
2121
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
2222
<groupId>io.streamnative.pulsar.handlers</groupId>
23-
<version>4.2.0-SNAPSHOT</version>
23+
<version>4.3.0-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
27-
</project>
27+
28+
<dependencies>
29+
<dependency>
30+
<groupId>io.streamnative</groupId>
31+
<artifactId>pulsar-client-original</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.apache.bookkeeper</groupId>
35+
<artifactId>bookkeeper-common</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.google.guava</groupId>
39+
<artifactId>guava</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>commons-codec</groupId>
43+
<artifactId>commons-codec</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.commons</groupId>
47+
<artifactId>commons-collections4</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>javax.validation</groupId>
51+
<artifactId>validation-api</artifactId>
52+
<version>${validation-api.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>com.github.ben-manes.caffeine</groupId>
56+
<artifactId>caffeine</artifactId>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.conscrypt</groupId>
60+
<artifactId>conscrypt-openjdk-uber</artifactId>
61+
<version>${conscrypt.version}</version>
62+
</dependency>
63+
</dependencies>
64+
</project>

‎mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.function.Consumer;
3131
import lombok.Getter;
3232
import lombok.extern.slf4j.Slf4j;
33-
import org.apache.pulsar.jetcd.shaded.io.vertx.core.impl.ConcurrentHashSet;
3433

3534
/**
3635
* Proxy connection manager.
@@ -40,7 +39,7 @@ public class MQTTConnectionManager {
4039

4140
private final ConcurrentMap<String, Connection> localConnections;
4241

43-
private final ConcurrentHashSet<String> eventClientIds;
42+
private final Set<String> eventClientIds;
4443

4544
@Getter
4645
private static final HashedWheelTimer sessionExpireInterval =
@@ -58,7 +57,7 @@ public class MQTTConnectionManager {
5857
public MQTTConnectionManager(String advertisedAddress) {
5958
this.advertisedAddress = advertisedAddress;
6059
this.localConnections = new ConcurrentHashMap<>(2048);
61-
this.eventClientIds = new ConcurrentHashSet<>(2048);
60+
this.eventClientIds = ConcurrentHashMap.newKeySet(2048);
6261
this.connectListener = new ConnectEventListener();
6362
this.disconnectListener = new DisconnectEventListener();
6463
}

‎mqtt-proxy/pom.xml‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
2222
<groupId>io.streamnative.pulsar.handlers</groupId>
23-
<version>4.2.0-SNAPSHOT</version>
23+
<version>4.3.0-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>pulsar-protocol-handler-mqtt-proxy</artifactId>
@@ -32,6 +32,50 @@
3232
<artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
35+
<dependency>
36+
<groupId>io.prometheus</groupId>
37+
<artifactId>simpleclient</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.eclipse.jetty</groupId>
41+
<artifactId>jetty-server</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.eclipse.jetty.ee8</groupId>
45+
<artifactId>jetty-ee8-servlet</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.glassfish.jersey.core</groupId>
49+
<artifactId>jersey-server</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.glassfish.jersey.containers</groupId>
53+
<artifactId>jersey-container-servlet-core</artifactId>
54+
<version>${jersey.version}</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.glassfish.jersey.media</groupId>
58+
<artifactId>jersey-media-multipart</artifactId>
59+
<version>${jersey.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>io.swagger</groupId>
63+
<artifactId>swagger-annotations</artifactId>
64+
<version>${swagger-annotations.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>javax.ws.rs</groupId>
68+
<artifactId>javax.ws.rs-api</artifactId>
69+
<version>${javax.ws.rs.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>javax.servlet</groupId>
73+
<artifactId>javax.servlet-api</artifactId>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.google.protobuf</groupId>
77+
<artifactId>protobuf-java</artifactId>
78+
</dependency>
3579
</dependencies>
3680
<build>
3781
<plugins>
@@ -55,4 +99,4 @@
5599
</plugin>
56100
</plugins>
57101
</build>
58-
</project>
102+
</project>

‎pom.xml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<groupId>io.streamnative.pulsar.handlers</groupId>
2121
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
22-
<version>4.2.0-SNAPSHOT</version>
22+
<version>4.3.0-SNAPSHOT</version>
2323
<name>StreamNative :: Pulsar Protocol Handler :: MoP Parent</name>
2424
<description>Parent for MQTT on Pulsar implemented using Pulsar Protocol Handler.</description>
2525

@@ -47,12 +47,11 @@
4747
</licenses>
4848

4949
<properties>
50-
<lombok.version>1.18.22</lombok.version>
5150
<mockito.version>2.22.0</mockito.version>
5251
<testng.version>6.14.3</testng.version>
5352
<awaitility.version>4.0.2</awaitility.version>
54-
<pulsar.version>4.2.0-SNAPSHOT</pulsar.version>
55-
<sn.bom.version>4.2.0-SNAPSHOT</sn.bom.version>
53+
<pulsar.version>4.3.0-SNAPSHOT</pulsar.version>
54+
<sn.bom.version>4.3.0-SNAPSHOT</sn.bom.version>
5655
<log4j2.version>2.18.0</log4j2.version>
5756
<fusesource.client.version>1.16</fusesource.client.version>
5857
<hivemq.mqtt.client.version>1.2.2</hivemq.mqtt.client.version>
@@ -72,6 +71,11 @@
7271
<spotbugs-maven-plugin.version>3.1.8</spotbugs-maven-plugin.version>
7372
<maven-jacoco-plugin.version>0.8.7</maven-jacoco-plugin.version>
7473
<opentelemetry.version>1.56.0</opentelemetry.version>
74+
<validation-api.version>2.0.1.Final</validation-api.version>
75+
<jersey.version>2.42</jersey.version>
76+
<swagger-annotations.version>1.6.15</swagger-annotations.version>
77+
<javax.ws.rs.version>2.1.1</javax.ws.rs.version>
78+
<conscrypt.version>2.5.2</conscrypt.version>
7579
</properties>
7680

7781
<dependencies>
@@ -131,6 +135,14 @@
131135
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
132136
<version>${opentelemetry.version}</version>
133137
</dependency>
138+
<dependency>
139+
<groupId>org.slf4j</groupId>
140+
<artifactId>slf4j-api</artifactId>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.apache.commons</groupId>
144+
<artifactId>commons-lang3</artifactId>
145+
</dependency>
134146
</dependencies>
135147

136148
<dependencyManagement>
@@ -198,13 +210,6 @@
198210
<source>${javac.source}</source>
199211
<target>${javac.target}</target>
200212
<useIncrementalCompilation>false</useIncrementalCompilation>
201-
<annotationProcessorPaths>
202-
<path>
203-
<groupId>org.projectlombok</groupId>
204-
<artifactId>lombok</artifactId>
205-
<version>${lombok.version}</version>
206-
</path>
207-
</annotationProcessorPaths>
208213
<compilerArgs>
209214
<arg>-parameters</arg>
210215
<!-- enable 'all' lint warnings with some exclusions -->

‎tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
2222
<groupId>io.streamnative.pulsar.handlers</groupId>
23-
<version>4.2.0-SNAPSHOT</version>
23+
<version>4.3.0-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>pulsar-protocol-handler-mqtt-tests</artifactId>

0 commit comments

Comments
 (0)