Skip to content

Commit 17dc7ae

Browse files
Ranjan-DasguptaRanjan-Dasgupta
authored andcommitted
Release update in develop branch
Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>
1 parent 888984a commit 17dc7ae

6 files changed

Lines changed: 19 additions & 13 deletions

File tree

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Please fill out the form below before submitting, thank you!
22

3-
- [ ] Bug exists Release Version 1.2.0 ( Master Branch)
4-
- [ ] Bug exists in MQTTv3 Client on Snapshot Version 1.2.1-SNAPSHOT (Develop Branch)
5-
- [ ] Bug exists in MQTTv5 Client on Snapshot Version 1.2.1-SNAPSHOT (Develop Branch)
3+
- [ ] Bug exists Release Version 1.2.3 ( Master Branch)
4+
- [ ] Bug exists in MQTTv3 Client on Snapshot Version 1.2.4-SNAPSHOT (Develop Branch)
5+
- [ ] Bug exists in MQTTv5 Client on Snapshot Version 1.2.4-SNAPSHOT (Develop Branch)
66

77
If this is a bug regarding the Android Service, please raise the bug here instead: https://github.com/eclipse/paho.mqtt.android/issues/new

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Please make sure that the following boxes are checked before submitting your Pul
22

33
- [ ] This change is against the develop branch, **not** master.
44
- [ ] You have signed the [Eclipse ECA](https://wiki.eclipse.org/ECA)
5-
- [ ] All of your commits have been signed-off with the correct email address (The same one that you used to sign the CLA) _Hint: use the -s argument when committing_.
6-
- [ ] If This PR fixes an issue, that you reference the issue below. OR if this is a new issue that you are fixing straight away that you add some Description about the bug and how this will fix it.
5+
- [ ] All of your commits have been signed-off with the correct email address (the same one that you
6+
used to sign the CLA) _Hint: use the -s argument when committing_.
7+
- [ ] If This PR fixes an issue, that you reference the issue below. OR if this is a new issue that
8+
you are fixing straight away that you add some Description about the bug and how this will fix it.
79
- [ ] If this is new functionality, You have added the appropriate Unit tests.

MQTTv3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Eclipse hosts a Nexus repository for those who want to use Maven to manage their
1111
Add the repository definition and the dependency definition shown below to your pom.xml.
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 .
14-
The latest release version is ```1.2.1``` and the current snapshot version is ```1.2.2-SNAPSHOT```.
14+
The latest release version is ```1.2.3``` and the current snapshot version is ```1.2.4-SNAPSHOT```.
1515

1616
```
1717
<project ...>

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.1``` and the current snapshot version is ```1.2.2-SNAPSHOT```.
35+
The latest release version is ```1.2.3``` and the current snapshot version is ```1.2.4-SNAPSHOT```.
3636

3737

3838
```

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/SendReceiveAsyncTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,10 @@ public void testConnectTimeout() throws Exception {
676676
catch (Exception exception) {
677677
log.log(Level.INFO, "Connect action failed as expected.");
678678
Assert.assertTrue(exception instanceof MqttException);
679-
Assert.assertEquals(MqttException.REASON_CODE_CLIENT_TIMEOUT, ((MqttException) exception).getReasonCode());
679+
Assert.assertEquals((
680+
MqttException.REASON_CODE_CLIENT_TIMEOUT == ((MqttException) exception).getReasonCode() ||
681+
MqttException.REASON_CODE_CLIENT_EXCEPTION == ((MqttException) exception).getReasonCode()),
682+
true);
680683
}
681684
finally {
682685
if (mqttClient != null) {
@@ -694,10 +697,11 @@ public void testConnectTimeout() throws Exception {
694697
catch (Exception exception) {
695698
log.log(Level.INFO, "Connect action failed as expected.");
696699
Assert.assertTrue(exception instanceof MqttException);
697-
Assert.assertEquals(
698-
(MqttException.REASON_CODE_CLIENT_TIMEOUT == ((MqttException) exception).getReasonCode() ||
699-
MqttException.REASON_CODE_CONNECT_IN_PROGRESS == ((MqttException) exception).getReasonCode())
700-
, true);
700+
Assert.assertEquals((
701+
MqttException.REASON_CODE_CLIENT_TIMEOUT == ((MqttException) exception).getReasonCode() ||
702+
MqttException.REASON_CODE_CLIENT_EXCEPTION == ((MqttException) exception).getReasonCode() ||
703+
MqttException.REASON_CODE_CONNECT_IN_PROGRESS == ((MqttException) exception).getReasonCode()),
704+
true);
701705
}
702706
finally {
703707
if (mqttClient != null) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.eclipse.paho</groupId>
55
<artifactId>java-parent</artifactId>
66
<packaging>pom</packaging>
7-
<version>1.2.2-SNAPSHOT</version>
7+
<version>1.2.4-SNAPSHOT</version>
88

99
<properties>
1010
<!-- source & target java version for MQTT Client -->

0 commit comments

Comments
 (0)