Skip to content

Commit

Permalink
Releasing Version 1.0.3 with Eclipse Oxygen
Browse files Browse the repository at this point in the history
Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
  • Loading branch information
jpwsutton committed Jul 4, 2017
2 parents e3a7127 + 522b48f commit 1fa2333
Show file tree
Hide file tree
Showing 15 changed files with 1,049 additions and 721 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
script:
mvn clean verify
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Paho reflects the inherent physical and cost constraints of device connectivity.

A zip file containing the full and a minified version the Javascript client can be downloaded from the [Paho downloads page](https://projects.eclipse.org/projects/technology.paho/downloads)

Alternatively the Javascript client can be downloaded directly from the projects git repository: [https://raw.githubusercontent.com/eclipse/paho.mqtt.javascript/master/src/mqttws31.js](https://raw.githubusercontent.com/eclipse/paho.mqtt.javascript/master/src/mqttws31.js).
Alternatively the Javascript client can be downloaded directly from the projects git repository: [https://raw.githubusercontent.com/eclipse/paho.mqtt.javascript/master/src/paho-mqtt.js](https://raw.githubusercontent.com/eclipse/paho.mqtt.javascript/master/src/paho-mqtt.js).

Please **do not** link directly to this url from your application.

Expand Down Expand Up @@ -53,7 +53,7 @@ src/tests

To run the tests with maven, use the following command:
```
$ mvn test -Dtest.server=iot.eclipse.com -Dtest.server.port=80 -Dtest.server.path=/ws
$ mvn test
```
The parameters passed in should be modified to match the broker instance being tested against.

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"description": "Pre reqs for the Paho JS client",
"dependencies": {
"websocket": "1.x.x",
"node-localstorage": "0.x.x",
"jasmine-node": "1.11.x"
"node-localstorage": "1.3.x",
"jasmine-node": "1.14.x",
"jshint" : "2.9.x"
}
}
35 changes: 24 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</license>
</licenses>
<properties>
<paho.version>1.0.2</paho.version>
<paho.version>1.0.3</paho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build.level>${maven.build.timestamp}</build.level>
<download.location>/home/data/httpd/download.eclipse.org/paho/releases/${paho.version}</download.location>
Expand Down Expand Up @@ -53,9 +53,9 @@
<webappSourceDir>${basedir}/</webappSourceDir>
<jsSourceDir>src/</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>mqttws31.js</jsSourceFile>
<jsSourceFile>paho-mqtt.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>mqttws31.js</jsFinalFile>
<jsFinalFile>paho-mqtt.js</jsFinalFile>
<jsTargetDir>target</jsTargetDir>
<webappTargetDir>${basedir}</webappTargetDir>
<jsEngine>CLOSURE</jsEngine>
Expand All @@ -76,24 +76,24 @@
<phase>process-sources</phase>
<configuration>
<tasks>
<copy file="src/mqttws31.js" toFile="target/mqttws31.js">
<copy file="src/paho-mqtt.js" toFile="target/paho-mqtt.js">
<filterset>
<filter token="VERSION" value="${project.version}"/>
<filter token="BUILDLEVEL" value="${build.level}"/>
</filterset>
</copy>
<copy file="target/mqttws31.min.js" toFile="target/mqttws31-min-2.js">
<copy file="target/paho-mqtt.min.js" toFile="target/paho-mqtt-min-2.js">
<filterset>
<filter token="VERSION" value="${project.version}"/>
<filter token="BUILDLEVEL" value="${build.level}"/>
</filterset>
</copy>
<concat destfile="target/mqttws31-min.js">
<concat destfile="target/paho-mqtt-min.js">
<fileset file="src/header.txt" />
<fileset file="target/mqttws31-min-2.js" />
<fileset file="target/paho-mqtt-min-2.js" />
</concat>
<delete file="target/mqttws31-min-2.js"/>
<delete file="target/mqttws31.min.js"/>
<delete file="target/paho-mqtt-min-2.js"/>
<delete file="target/paho-mqtt.min.js"/>
</tasks>
</configuration>
<goals>
Expand All @@ -108,7 +108,7 @@
<artifactId>jasmine-maven-plugin</artifactId>
<version>1.3.1.2</version>
<configuration>
<jsSrcDir>${basedir}/target/src/javascript</jsSrcDir>
<jsSrcDir>${basedir}/target/src</jsSrcDir>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -239,6 +239,19 @@
</arguments>
</configuration>
</execution>
<execution>
<id>jshint</id>
<phase>compile</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>node_modules/jshint/bin/jshint</executable>
<arguments>
<argument>src/paho-mqtt.js</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>install-jsdoc-modules</id>
<phase>generate-resources</phase>
Expand All @@ -263,7 +276,7 @@
<executable>node</executable>
<arguments>
<argument>node_modules/jsdoc/jsdoc.js</argument>
<argument>target/mqttws31.js</argument>
<argument>target/paho-mqtt.js</argument>
<argument>-d</argument>
<argument>target/docs</argument>
</arguments>
Expand Down
9 changes: 4 additions & 5 deletions src/header.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 IBM Corp.
* Copyright (c) 2013, 2016 IBM Corp.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
* and Eclipse Distribution License v1.0 which accompany this distribution.
*
* The Eclipse Public License is available at
* The Eclipse Public License is available at
* http://www.eclipse.org/legal/epl-v10.html
* and the Eclipse Distribution License is available at
* and the Eclipse Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
*******************************************************************************/

Loading

0 comments on commit 1fa2333

Please sign in to comment.