Skip to content

Commit 9f16193

Browse files
author
Ranjan Dasgupta
authored
Merge pull request #795 from rdasgupt/develop
Code updates for MQTTv5 Release
2 parents d11139f + 2c0f476 commit 9f16193

69 files changed

Lines changed: 1186 additions & 3409 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,10 @@ target/
6262

6363

6464
*.log.*
65+
66+
# Test files
67+
Bug443142Test-*-tcplocalhost*
68+
client-1-tcpioteclipseorg1882
69+
testConnectTimeout
70+
71+

‎.travis.yml‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
1-
sudo: true
1+
sudo: required
22
language: java
33
install: true
4-
matrix:
4+
5+
jobs:
56
include:
67
- os: linux
78
dist: trusty
8-
sudo: required
99
jdk: oraclejdk8
10-
# - os: osx
11-
# jdk: oraclejdk8
12-
13-
14-
15-
16-
sudo: required
1710

1811
before_install:
1912
- ./start-broker.sh
2013

2114
script:
2215
- mvn -B clean -q
2316
- mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
24-
# - mvn -B --projects org.eclipse.paho.mqttv5.common,org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
17+
- mvn -B --projects org.eclipse.paho.mqttv5.common,org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
2518

26-
#addons:
27-
# apt:
28-
# sources:
29-
# - sourceline: 'ppa:mosquitto-dev/mosquitto-ppa'
30-
# packages:
31-
# - mosquitto

‎MQTTv3.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Add the repository definition and the dependency definition shown below to your
1212

1313
Replace %REPOURL% with either ``` https://repo.eclipse.org/content/repositories/paho-releases/ ``` for the official releases, or ``` https://repo.eclipse.org/content/repositories/paho-snapshots/ ``` for the nightly snapshots. Replace %VERSION% with the level required .
1414

15-
The latest release version is ```1.2.4``` and the current snapshot version is ```1.2.5-SNAPSHOT```.
15+
The latest release version is ```1.2.5``` and the current snapshot version is ```1.2.6```.
1616

1717

1818
```

‎MQTTv5.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ This client is under active development and as such may be incomplete / broken a
2222

2323
If you have any ideas about how the API should be designed going forward, then please chip in on [this](https://github.com/eclipse/paho.mqtt.java/issues/389) issue.
2424

25-
And of course, if you think of an amazing new feature for the v5 client, have a go at implementing it and submit a Pull Request against the develop branch!
25+
And of course, if you think of an amazing new feature for the v5 client, have a go at implementing it and submit a Pull Request against the develop branch!

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Add the repository definition and the dependency definition shown below to your
3232

3333
Replace %REPOURL% with either ``` https://repo.eclipse.org/content/repositories/paho-releases/ ``` for the official releases, or ``` https://repo.eclipse.org/content/repositories/paho-snapshots/ ``` for the nightly snapshots. Replace %VERSION% with the level required .
3434

35-
The latest release version is ```1.2.4``` and the current snapshot version is ```1.2.5-SNAPSHOT```.
35+
The latest release version is ```1.2.5``` and the current snapshot version is ```1.2.6```.
3636

3737

3838
```

‎org.eclipse.paho.client.mqttv3.repository/pom.xml‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.eclipse.paho</groupId>
5-
<artifactId>java-parent</artifactId>
6-
<version>1.2.5-SNAPSHOT</version>
7-
</parent>
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>org.eclipse.paho</groupId>
5+
<artifactId>java-parent</artifactId>
6+
<version>1.2.5-SNAPSHOT</version>
7+
</parent>
88

9-
<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>
10-
<version>1.2.5-SNAPSHOT</version>
11-
<packaging>eclipse-repository</packaging>
9+
<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>
10+
<version>1.2.5-SNAPSHOT</version>
11+
<packaging>eclipse-repository</packaging>
1212

13-
<name>Paho P2 Repository</name>
13+
<name>Paho P2 Repository</name>
1414

15-
<build>
16-
<plugins>
17-
<plugin>
18-
<groupId>org.eclipse.tycho</groupId>
19-
<artifactId>tycho-maven-plugin</artifactId>
20-
</plugin>
21-
<plugin>
22-
<artifactId>maven-antrun-plugin</artifactId>
23-
<executions>
24-
<execution>
25-
<id>deploy</id>
26-
<phase>deploy</phase>
27-
<goals>
28-
<goal>run</goal>
29-
</goals>
30-
<configuration>
31-
<tasks>
32-
<delete includeemptydirs="false" quiet="true">
33-
<fileset dir="${download.location}">
34-
<include name="**" />
35-
</fileset>
36-
</delete>
37-
<copy includeemptydirs="false" todir="${download.location}">
38-
<fileset dir="${project.build.directory}/repository/">
39-
<include name="**" />
40-
</fileset>
41-
</copy>
42-
</tasks>
43-
</configuration>
44-
</execution>
45-
</executions>
46-
</plugin>
47-
<!-- <plugin>
48-
<groupId>org.eclipse.tycho.extras</groupId>
49-
<artifactId>tycho-p2-extras-plugin</artifactId>
50-
<executions>
51-
<execution>
52-
<id>update-main-p2-repo</id>
53-
<phase>package</phase>
54-
<goals>
55-
<goal>publish-features-and-bundles</goal>
56-
</goals>
57-
<configuration>
58-
<append>true</append>
59-
<artifactRepositoryLocation>/shared/technology/paho/Java</artifactRepositoryLocation>
60-
<metadataRepositoryLocation>/shared/technology/paho/Java</metadataRepositoryLocation>
61-
<sourceLocation>${project.build.directory}/repository</sourceLocation>
62-
</configuration>
63-
</execution>
64-
</executions>
65-
</plugin> -->
66-
</plugins>
67-
</build>
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.eclipse.tycho</groupId>
19+
<artifactId>tycho-maven-plugin</artifactId>
20+
</plugin>
21+
<plugin>
22+
<artifactId>maven-antrun-plugin</artifactId>
23+
<executions>
24+
<execution>
25+
<id>deploy</id>
26+
<phase>deploy</phase>
27+
<goals>
28+
<goal>run</goal>
29+
</goals>
30+
<configuration>
31+
<tasks>
32+
<delete includeemptydirs="false" quiet="true">
33+
<fileset dir="${download.location}">
34+
<include name="**" />
35+
</fileset>
36+
</delete>
37+
<copy includeemptydirs="false" todir="${download.location}">
38+
<fileset dir="${project.build.directory}/repository/">
39+
<include name="**" />
40+
</fileset>
41+
</copy>
42+
</tasks>
43+
</configuration>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
<!-- <plugin>
48+
<groupId>org.eclipse.tycho.extras</groupId>
49+
<artifactId>tycho-p2-extras-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>update-main-p2-repo</id>
53+
<phase>package</phase>
54+
<goals>
55+
<goal>publish-features-and-bundles</goal>
56+
</goals>
57+
<configuration>
58+
<append>true</append>
59+
<artifactRepositoryLocation>/shared/technology/paho/Java</artifactRepositoryLocation>
60+
<metadataRepositoryLocation>/shared/technology/paho/Java</metadataRepositoryLocation>
61+
<sourceLocation>${project.build.directory}/repository</sourceLocation>
62+
</configuration>
63+
</execution>
64+
</executions>
65+
</plugin> -->
66+
</plugins>
67+
</build>
6868
</project>

0 commit comments

Comments
 (0)