Merge develop into master (openfin#23)

wenjunche · web-flow · commit 0f4d93dc7bd9 · 2018-09-06T13:32:03.000-04:00
* ADAP-114: adapter 6.0.1.3 * ADAP-115: Igore registerUser test for now * ADAP-115: added Application.registerUser * ADAP-120: Upgrade JNA to 4.5.1 * ADAP-120: updateed embed exampled * ADAP-122 Upgrade adapter to 6.0.2.2-SNAPSHOT * ADAP-125: update RELEASENOTES-ADAPTER.md * ADAP-126: update adapter to 7.0.1 * RUN-3975 added unit test case for IAB with reconnection. (openfin#19) * ADAP-130: adapter updates * ADAP-130: update docs * ADAP-134 fixed sample code that doesn't build with Java 10 * ADAP-136: Adapter 7.0.1 release * ADAP-139 updated embedded code and script, added description in readme * Update README.md * Update README.md * ADAP-138: updated RELEASENOTES for 7.0.2 * ADAP-138: Fixed fxdemo.bat
diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-            <version>7.0.1</version>
+            <version>7.0.2</version>
         </dependency>
         <dependency>
             <groupId>co.openfin</groupId>
diff --git a/release/fxdemo.bat b/release/fxdemo.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.1.1.jar;openfin-desktop-java-adapter-6.0.1.2-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties com.openfin.desktop.demo.FxDemo
+java -cp openfin-desktop-java-example-6.0.1.3-SNAPSHOT.jar;openfin-desktop-java-adapter-7.0.2.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co com.openfin.desktop.demo.FxDemo
diff --git a/release/openfin-desktop-java-adapter-7.0.2.jar b/release/openfin-desktop-java-adapter-7.0.2.jar

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-java -cp openfin-desktop-java-example-6.0.1.1.jar;openfin-desktop-java-adapter-6.0.1.2-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties com.openfin.desktop.demo.FxDemo`
	`1`	+java -cp openfin-desktop-java-example-6.0.1.3-SNAPSHOT.jar;openfin-desktop-java-adapter-7.0.2.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co com.openfin.desktop.demo.FxDemo