Skip to content

Commit 2918feb

Browse files
author
luxurong
committed
Merge branch 'release/1.0.7' into main
2 parents 8404262 + 337dca8 commit 2918feb

File tree

15 files changed

+55
-31
lines changed

15 files changed

+55
-31
lines changed

‎pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>io.github.quickmsg</groupId>
77
<artifactId>smqtt</artifactId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
<modules>
1010
<module>smqtt-common</module>
1111
<module>smqtt-core</module>
@@ -26,7 +26,6 @@
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
<maven.compiler.source>1.8</maven.compiler.source>
2828
<maven.compiler.target>1.8</maven.compiler.target>
29-
<io.projectreactor.netty>1.0.5</io.projectreactor.netty>
3029
<lombok>1.18.6</lombok>
3130
<reactor.version>2020.0.6</reactor.version>
3231
<slf4j.version>1.7.30</slf4j.version>

‎smqtt-bootstrap/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<parent>
88
<artifactId>smqtt</artifactId>
99
<groupId>io.github.quickmsg</groupId>
10-
<version>1.0.6</version>
10+
<version>1.0.7</version>
1111
</parent>
1212
<artifactId>smqtt-bootstrap</artifactId>
13-
<version>1.0.6</version>
13+
<version>1.0.7</version>
1414

1515
<name>smqtt-bootstrap</name>
1616
<url>http://www.example.com</url>
@@ -30,17 +30,17 @@
3030
<dependency>
3131
<groupId>io.github.quickmsg</groupId>
3232
<artifactId>smqtt-core</artifactId>
33-
<version>1.0.6</version>
33+
<version>1.0.7</version>
3434
</dependency>
3535
<dependency>
3636
<artifactId>smqtt-registry-scube</artifactId>
3737
<groupId>io.github.quickmsg</groupId>
38-
<version>1.0.6</version>
38+
<version>1.0.7</version>
3939
</dependency>
4040
<dependency>
4141
<artifactId>smqtt-ui</artifactId>
4242
<groupId>io.github.quickmsg</groupId>
43-
<version>1.0.6</version>
43+
<version>1.0.7</version>
4444
</dependency>
4545
</dependencies>
4646
<profiles>

‎smqtt-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>smqtt</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>

‎smqtt-core/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>smqtt</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<name>smqtt-core</name>
@@ -14,12 +14,12 @@
1414
<dependency>
1515
<groupId>io.github.quickmsg</groupId>
1616
<artifactId>smqtt-common</artifactId>
17-
<version>1.0.6</version>
17+
<version>1.0.7</version>
1818
</dependency>
1919
<dependency>
2020
<groupId>io.github.quickmsg</groupId>
2121
<artifactId>smqtt-metric</artifactId>
22-
<version>1.0.6</version>
22+
<version>1.0.7</version>
2323
</dependency>
2424
</dependencies>
2525

‎smqtt-metric/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>smqtt</artifactId>
1010
<groupId>io.github.quickmsg</groupId>
11-
<version>1.0.6</version>
11+
<version>1.0.7</version>
1212
</parent>
1313

1414
<artifactId>smqtt-metric</artifactId>
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.github.quickmsg</groupId>
1919
<artifactId>smqtt-common</artifactId>
20-
<version>1.0.6</version>
20+
<version>1.0.7</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>com.github.oshi</groupId>

‎smqtt-persistent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>smqtt</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>pom</packaging>

‎smqtt-persistent/smqtt-persistent-db/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>smqtt-persistent</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>smqtt-persistent-db</artifactId>
13-
<version>1.0.6</version>
13+
<version>1.0.7</version>
1414

1515
<properties>
1616
<jooq.version>3.14.11</jooq.version>
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>io.github.quickmsg</groupId>
2222
<artifactId>smqtt-common</artifactId>
23-
<version>1.0.6</version>
23+
<version>1.0.7</version>
2424
<scope>compile</scope>
2525
</dependency>
2626

‎smqtt-persistent/smqtt-persistent-redis/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>smqtt-persistent</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>smqtt-persistent-redis</artifactId>
13-
<version>1.0.6</version>
13+
<version>1.0.7</version>
1414

1515
<properties>
1616
<redisson.version>3.15.6</redisson.version>
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>io.github.quickmsg</groupId>
2222
<artifactId>smqtt-common</artifactId>
23-
<version>1.0.6</version>
23+
<version>1.0.7</version>
2424
<scope>compile</scope>
2525
</dependency>
2626

‎smqtt-registry/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>smqtt</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>pom</packaging>

‎smqtt-registry/smqtt-registry-akka/pom.xml

+14-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<parent>
88
<artifactId>smqtt-registry</artifactId>
99
<groupId>io.github.quickmsg</groupId>
10-
<version>1.0.6</version>
10+
<version>1.0.7</version>
1111
</parent>
1212
<artifactId>smqtt-registry-akka</artifactId>
13-
<version>1.0.6</version>
13+
<version>1.0.7</version>
1414

1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,5 +47,16 @@
4747
<scope>test</scope>
4848
</dependency>
4949
</dependencies>
50-
50+
<build>
51+
<plugins>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-deploy-plugin</artifactId>
55+
<version>2.7</version>
56+
<configuration>
57+
<skip>true</skip>
58+
</configuration>
59+
</plugin>
60+
</plugins>
61+
</build>
5162
</project>

‎smqtt-registry/smqtt-registry-scube/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>smqtt-registry</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>smqtt-registry-scube</artifactId>
@@ -14,7 +14,7 @@
1414

1515

1616
<properties>
17-
<scalecube-cluster.version>2.6.7</scalecube-cluster.version>
17+
<scalecube-cluster.version>2.6.9</scalecube-cluster.version>
1818
<log4j.version>2.13.2</log4j.version>
1919
<slf4j.version>1.7.30</slf4j.version>
2020
</properties>
@@ -44,7 +44,8 @@
4444
<dependency>
4545
<groupId>io.github.quickmsg</groupId>
4646
<artifactId>smqtt-common</artifactId>
47-
<version>1.0.6</version>
47+
<version>1.0.7</version>
48+
<scope>provided</scope>
4849
</dependency>
4950
<dependency>
5051
<groupId>junit</groupId>

‎smqtt-registry/smqtt-registry-scube/src/main/java/io/github/quickmsg/registry/ScubeClusterRegistry.java

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.scalecube.cluster.membership.MembershipEvent;
1313
import io.scalecube.cluster.transport.api.Message;
1414
import io.scalecube.net.Address;
15+
import io.scalecube.transport.netty.tcp.TcpTransportFactory;
1516
import lombok.extern.slf4j.Slf4j;
1617
import reactor.core.publisher.Flux;
1718
import reactor.core.publisher.Mono;
@@ -43,6 +44,7 @@ public void registry(ClusterConfig clusterConfig) {
4344
.externalHost(clusterConfig.getExternalHost())
4445
.externalPort(clusterConfig.getExternalPort())
4546
)
47+
.transportFactory(TcpTransportFactory::new)
4648
.transport(transportConfig -> transportConfig.port(clusterConfig.getPort()))
4749
.membership(opts -> opts.seedMembers(Arrays.stream(clusterConfig
4850
.getClusterUrl()

‎smqtt-rule/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>smqtt</artifactId>
99
<groupId>io.github.quickmsg</groupId>
10-
<version>1.0.6</version>
10+
<version>1.0.7</version>
1111
</parent>
1212
<artifactId>smqtt-rule</artifactId>
1313
<modules>

‎smqtt-rule/smqtt-rule-dsl/pom.xml

+13-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,22 @@
55
<parent>
66
<artifactId>smqtt-rule</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>smqtt-rule-dsl</artifactId>
13-
13+
<build>
14+
<plugins>
15+
<plugin>
16+
<groupId>org.apache.maven.plugins</groupId>
17+
<artifactId>maven-deploy-plugin</artifactId>
18+
<version>2.7</version>
19+
<configuration>
20+
<skip>true</skip>
21+
</configuration>
22+
</plugin>
23+
</plugins>
24+
</build>
1425

1526
</project>

‎smqtt-ui/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>smqtt</artifactId>
77
<groupId>io.github.quickmsg</groupId>
8-
<version>1.0.6</version>
8+
<version>1.0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>smqtt-ui</artifactId>

0 commit comments

Comments
 (0)