Skip to content

Commit ebe49fd

Browse files
Ranjan-DasguptaRanjan-Dasgupta
Ranjan-Dasgupta
authored and
Ranjan-Dasgupta
committed
Fix conflit
Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>
2 parents aae3618 + 5341eb3 commit ebe49fd

86 files changed

Lines changed: 122 additions & 41 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.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ before_install:
1414
script:
1515
- mvn -B clean -q
1616
- mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.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
17+
- mvn -B --projects org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
1818

‎org.eclipse.paho.client.mqttv3/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: %bundle.name
3+
Bundle-Name: org.eclipse.paho.client.mqttv3
44
Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
55
Bundle-Version: 1.2.5
66
Bundle-Localization: bundle

‎org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class ClientComms {
9393
* @param persistence the {@link MqttClientPersistence} layer.
9494
* @param pingSender the {@link MqttPingSender}
9595
* @param executorService the {@link ExecutorService}
96-
* @param highResolutionTimer User specified high resolution timer
96+
* @param highResolutionTimer the {@link HighResolutionTimer}
9797
* @throws MqttException if an exception occurs whilst communicating with the server
9898
*/
9999
public ClientComms(IMqttAsyncClient client, MqttClientPersistence persistence, MqttPingSender pingSender,

‎org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsReceiver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void run() {
168168
}
169169
else {
170170
// fix for bug 719
171-
if (!clientComms.isConnected()) {
171+
if (!clientComms.isConnected() && !clientComms.isConnecting()) {
172172
throw new IOException("Connection is lost.");
173173
}
174174
}

‎org.eclipse.paho.mqttv5.client.repository/category.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<bundle id="org.eclipse.paho.mqttv5.client" version="1.2.5.qualifier">
4+
<category name="Paho MQTT Java"/>
5+
</bundle>
6+
<category-def name="Paho MQTT Java" label="Paho MQTT Java">
7+
<description>
8+
The Eclipse Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things (IoT).
9+
</description>
10+
</category-def>
11+
</site>

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<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>
8+
9+
<artifactId>org.eclipse.paho.mqttv5.client.repository</artifactId>
10+
<version>1.2.5-SNAPSHOT</version>
11+
<packaging>eclipse-repository</packaging>
12+
13+
<name>Paho P2 Repository</name>
14+
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>
68+
</project>

‎org.eclipse.paho.mqttv5.client.test/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<version>3.8.1</version>
2828
<scope>test</scope>
2929
</dependency>
30-
<dependency>
31-
<groupId>org.eclipse.paho</groupId>
32-
<artifactId>org.eclipse.paho.mqttv5.common</artifactId>
33-
<version>1.2.5</version>
34-
</dependency>
3530
<dependency>
3631
<groupId>org.eclipse.paho</groupId>
3732
<artifactId>org.eclipse.paho.mqttv5.client</artifactId>

‎org.eclipse.paho.mqttv5.client/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
<name>org.eclipse.paho.mqttv5.client</name>
1515
<packaging>eclipse-plugin</packaging>
1616

17+
<dependencies>
18+
<dependency>
19+
<groupId>junit</groupId>
20+
<artifactId>junit</artifactId>
21+
<version>${junit.version}</version>
22+
</dependency>
23+
</dependencies>
24+
1725
<build>
1826
<plugins>
1927
<plugin>
@@ -36,6 +44,25 @@
3644
</executions>
3745
</plugin>
3846

47+
<plugin>
48+
<groupId>org.eclipse.tycho</groupId>
49+
<artifactId>tycho-maven-plugin</artifactId>
50+
</plugin>
51+
52+
<plugin>
53+
<groupId>org.codehaus.mojo</groupId>
54+
<artifactId>templating-maven-plugin</artifactId>
55+
<version>1.0.0</version>
56+
<executions>
57+
<execution>
58+
<id>filter-src</id>
59+
<goals>
60+
<goal>filter-sources</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
3966
<!--
4067
Submit code coverage report to coveralls.io
4168
https://coveralls.io/github/ibm-watson-iot/iot-java

org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java renamed to org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java

File renamed without changes.

org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/MqttException.java renamed to org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/common/MqttException.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@ public MqttException(int reasonCode) {
5555
* <code>MqttCallback.disconnected</code> callback is the intended disconnect
5656
* notification mechanism.
5757
*
58-
* @param reasonCode
59-
* the reason code associated with the exception
60-
* @param disconnect
61-
* the disconnect data
58+
* @param reasonCode the reason code for the exception.
59+
* @param disconnect diconnect flag
6260
*/
6361
public MqttException(int reasonCode, MqttDisconnect disconnect) {
6462
super();

0 commit comments

Comments
 (0)