Skip to content

Commit b5a4c8c

Browse files
author
Ranjan Dasgupta
authored
Merge branch 'master' into develop
2 parents d9b7eaa + 2358b33 commit b5a4c8c

22 files changed

Lines changed: 371 additions & 47 deletions

File tree

‎.github/ISSUE_TEMPLATE.md‎

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

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.3-SNAPSHOT (Develop Branch)
3+
- [ ] Bug exists Release Version 1.2.5 ( Master Branch)
4+
- [ ] Bug exists in MQTTv3 Client on Snapshot Version 1.2.6-SNAPSHOT (Develop Branch)
5+
- [ ] Bug exists in MQTTv5 Client on Snapshot Version 1.2.6-SNAPSHOT (Develop Branch)
66

77

88
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/workflows/main.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ jobs:
3030
java-version: ${{ matrix.java }}
3131
java-package: jdk
3232
- name: Package with Maven skip tests
33-
run: mvn -B --projects org.eclipse.paho.client.mqttv3 package -DskipTests
33+
run: mvn -B package --file pom.xml -DskipTests
3434

‎build.gradle‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*
4+
* This generated file contains a sample Java project to get you started.
5+
* For more details take a look at the Java Quickstart chapter in the Gradle
6+
* User Manual available at https://docs.gradle.org/6.0.1/userguide/tutorial_java_projects.html
7+
*/
8+
9+
plugins {
10+
id 'java'
11+
12+
id 'application'
13+
}
14+
15+
compileJava {
16+
options.compilerArgs << '-Xlint:deprecation'
17+
options.compilerArgs << '-Xlint:unchecked'
18+
}
19+
20+
version = '1.0.0'
21+
22+
repositories {
23+
mavenCentral()
24+
}
25+
26+
def tempDir = file("tmp")
27+
28+
task createTmpdir() {
29+
delete tempDir
30+
tempDir.mkdirs()
31+
}
32+
33+
test.dependsOn createTmpdir
34+
35+
configurations {
36+
libs
37+
}
38+
39+
dependencies {
40+
libs 'org.json:json:20211205'
41+
libs 'org.apache.commons:commons-jcs3-core:3.0'
42+
libs 'org.apache.commons:commons-csv:1.9.0'
43+
libs 'commons-net:commons-net:3.0.1'
44+
libs 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
45+
libs 'com.ibm.db2:jcc:11.5.0.0'
46+
libs 'org.eclipse.paho:org.eclipse.paho.mqttv5.client:1.2.5'
47+
48+
testImplementation 'junit:junit:4.13.1'
49+
50+
configurations.implementation.extendsFrom(configurations.libs)
51+
}
52+
53+
task getDeps(type: Copy) {
54+
from sourceSets.main.runtimeClasspath
55+
into 'libs/'
56+
}
57+
58+
application {
59+
mainClassName = 'com.ibm.mas.scada.historian.connector.Connector'
60+
}
61+
62+
test {
63+
useJUnit()
64+
}
65+

‎gradlew‎

Lines changed: 184 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎org.eclipse.paho.client.mqttv3.internal.traceformat/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<!-- classpath.folder = ship.folder of org.eclipse.paho.client.mqttv3 build.xml -->
99
<property name="classpath.folder" value="../org.eclipse.paho.client.mqttv3/target/ship" />
1010

11-
<property name="client.release.version" value="1.2.6.qualifier" />
12-
<property name="bundleVersion" value="1.2.6.qualifier" />
11+
<property name="client.release.version" value="1.2.6" />
12+
<property name="bundleVersion" value="1.2.6" />
1313

1414
<property name="bundleVendor" value="Eclipse.org" />
1515
<property name="build.level" value="LYYMMDD" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.6.qualifier">
3+
<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.6">
44
<category name="Paho MQTT Java"/>
55
</bundle>
66
<category-def name="Paho MQTT Java" label="Paho MQTT Java">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>org.eclipse.paho</groupId>
55
<artifactId>java-parent</artifactId>
6-
<version>1.2.6-SNAPSHOT</version>
6+
<version>1.2.6</version>
77
</parent>
88

99
<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>
10-
<version>1.2.6-SNAPSHOT</version>
10+
<version>1.2.6</version>
1111
<packaging>eclipse-repository</packaging>
1212

13-
<name>Paho P2 Repository</name>
13+
<name>Paho P2 Repository for mqttv3 client</name>
1414

1515
<build>
1616
<plugins>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<parent>
55
<groupId>org.eclipse.paho</groupId>
66
<artifactId>java-parent</artifactId>
7-
<version>1.2.6-SNAPSHOT</version>
7+
<version>1.2.6</version>
88
</parent>
99

1010
<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
11-
<version>1.2.6-SNAPSHOT</version>
11+
<version>1.2.6</version>
1212
<packaging>jar</packaging>
1313

1414
<build>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.eclipse.paho</groupId>
8989
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
90-
<version>1.2.6-SNAPSHOT</version>
90+
<version>1.2.6</version>
9191
</dependency>
9292

9393
<dependency>

‎org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/MqttDataTypesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void TestEncodeAndDecodeComplexUTF8String() throws MqttException {
136136
*/
137137
@Test
138138
public void testICanEatGlass() throws IOException, MqttException {
139-
ClassLoader classLoader = getClass().getClassLoader();
139+
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
140140
String encodedFileName = classLoader.getResource("i_can_eat_glass.txt").getFile();
141141
String decodedFileName;
142142
try {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: org.eclipse.paho.client.mqttv3
44
Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
5-
Bundle-Version: 1.2.6.qualifier
5+
Bundle-Version: 1.2.6
66
Bundle-Localization: bundle
7-
Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.6.qualifier",
8-
org.eclipse.paho.client.mqttv3.logging;version="1.2.6.qualifier",
9-
org.eclipse.paho.client.mqttv3.persist;version="1.2.6.qualifier",
10-
org.eclipse.paho.client.mqttv3.util;version="1.2.6.qualifier"
11-
Bundle-Vendor: Eclipse Paho
7+
Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.6",
8+
org.eclipse.paho.client.mqttv3.logging;version="1.2.6",
9+
org.eclipse.paho.client.mqttv3.persist;version="1.2.6",
10+
org.eclipse.paho.client.mqttv3.util;version="1.2.6"
11+
Bundle-Vendor: %bundle.provider
1212
Bundle-ActivationPolicy: lazy
1313
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
1414
Import-Package: javax.net;resolution:=optional,

0 commit comments

Comments
 (0)