Skip to content

Commit a8dfb1b

Browse files
authored
Update dependencies and CI fixes (#644)
Update project dependencies - Netty 4.1.73.Final - Netty TC native 2.0.46.Final - slf4j 1.7.25 Aligns CI: - switch build branch from master to main - update JDK matrix to test against 11 and 17 Update versions used in README
1 parent 8ef4f99 commit a8dfb1b

File tree

4 files changed

+18
-39
lines changed

4 files changed

+18
-39
lines changed

.github/workflows/maven_build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ name: Java CI with Maven
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
jobs:
1313
test:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
1717
os: [ubuntu-18.04, ubuntu-latest]
18-
java: [11, 12, 15]
18+
java: [11, 17]
1919
arch: [x64] # when ARM will be present add aarch64
2020
fail-fast: false
2121
max-parallel: 4

.github/workflows/maven_central_snapshot_version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Build and ship SNAPSHOT versions to Maven Central
44

55
on:
66
push:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010
publish:

README.md

+8-31
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
![Java CI with Maven](https://github.com/moquette-io/moquette/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master)
1+
ServerIntegrationOpenSSLTest![Java CI with Maven](https://github.com/moquette-io/moquette/workflows/Java%20CI%20with%20Maven/badge.svg?branch=main)
22

33
## Moquette Project
44

5-
[![Build Status](https://api.travis-ci.org/moquette-io/moquette.svg?branch=master)](https://travis-ci.org/moquette-io/moquette)
5+
[![Build Status](https://api.travis-ci.org/moquette-io/moquette.svg?branch=main)](https://travis-ci.org/moquette-io/moquette)
66

77
* [Documentation reference guide](http://moquette-io.github.io/moquette/) Guide on how to use and configure Moquette
88
* [Google Group](https://groups.google.com/forum/#!forum/moquette-mqtt) Google Group to participate in development discussions.
@@ -20,17 +20,13 @@ Moquette is also used into [Atomize Spin](http://atomizesoftware.com/spin) a sof
2020
Part of moquette are used into the [Vertx MQTT module](https://github.com/giovibal/vertx-mqtt-broker-mod), into [MQTT spy](http://kamilfb.github.io/mqtt-spy/)
2121
and into [WSO2 Messge broker](http://techexplosives-pamod.blogspot.it/2014/05/mqtt-transport-architecture-wso2-mb-3x.html).
2222

23-
## Try the demo instance
24-
25-
Point your browser to [cloud instance](http://broker.moquette.io), request an account then use it from your MQTT clients.
26-
2723
## 1 minute set up
2824

29-
Start play with it, download the self distribution tar from [BinTray](https://bintray.com/artifact/download/andsel/generic/moquette-0.14.tar.gz) ,
25+
Start play with it, download the self distribution tar from [BinTray](https://bintray.com/artifact/download/andsel/generic/moquette-0.15.tar.gz) ,
3026
the un untar and start the broker listening on `1883` port and enjoy!
3127

3228
```
33-
tar xvf moquette-distribution-0.14.tar.gz
29+
tar xvf moquette-distribution-0.15.tar.gz
3430
cd bin
3531
./moquette.sh
3632
```
@@ -44,38 +40,19 @@ Or if you are on Windows shell
4440

4541
## Embedding in other projects
4642

47-
To embed Moquette in another maven project is sufficient to include a repository and declare the dependency:
48-
49-
```
50-
<repositories>
51-
<repository>
52-
<id>bintray</id>
53-
<url>https://jcenter.bintray.com</url>
54-
<releases>
55-
<enabled>true</enabled>
56-
</releases>
57-
<snapshots>
58-
<enabled>false</enabled>
59-
</snapshots>
60-
</repository>
61-
</repositories>
62-
```
63-
6443
Include dependency in your project:
6544

6645
```
6746
<dependency>
6847
<groupId>io.moquette</groupId>
6948
<artifactId>moquette-broker</artifactId>
70-
<version>0.14</version>
49+
<version>0.15</version>
7150
</dependency>
7251
```
7352

7453
## Build from sources
7554

55+
After a git clone of the repository, cd into the cloned sources and: `./gradlew package`, at the end the distribution
56+
package is present at `distribution/target/distribution-0.16-SNAPSHOT-bundle.tar.gz`
7657

77-
After a git clone of the repository, cd into the cloned sources and: `./gradlew clean moquette-distribution:distMoquetteTar` or
78-
`./gradlew clean moquette-distribution:distMoquetteZip`.
79-
80-
81-
In distribution/build directory will be produced the selfcontained file for the broker with all dependencies and a running script.
58+
In distribution/target directory will be produced the selfcontained file for the broker with all dependencies and a running script.

broker/pom.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414

1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<netty.version>4.1.59.Final</netty.version>
18-
<netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
17+
<netty.version>4.1.73.Final</netty.version>
18+
<!-- Check Netty pom.xm to know the right version of tcnative, for example
19+
https://github.com/netty/netty/blob/netty-4.1.73.Final/pom.xml#L545 -->
20+
<netty.tcnative.version>2.0.46.Final</netty.tcnative.version>
1921
<paho.version>1.2.5</paho.version>
2022
<h2.version>1.4.199</h2.version>
2123
</properties>
@@ -24,14 +26,14 @@
2426
<dependency>
2527
<groupId>org.slf4j</groupId>
2628
<artifactId>slf4j-api</artifactId>
27-
<version>1.7.25</version>
29+
<version>1.7.35</version>
2830
</dependency>
2931

3032
<dependency>
3133
<!-- This is used to use log4j12 implementation -->
3234
<groupId>org.slf4j</groupId>
3335
<artifactId>slf4j-log4j12</artifactId>
34-
<version>1.7.25</version>
36+
<version>1.7.35</version>
3537
<scope>runtime</scope>
3638
</dependency>
3739

0 commit comments

Comments
 (0)