Skip to content

Commit 4aca66d

Browse files
wenjunchewenjunche
authored
Merge develop to master (openfin#18)
* 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
1 parent d87f3f7 commit 4aca66d

15 files changed

+47
-14
lines changed

‎RELEASENOTES-ADAPTER.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
# Version 6.0.1.3
1+
2+
# Version 6.0.2.2-SNAPSHOT
3+
4+
## New Features
5+
* Improved thread safety with concurrent collection classes.
6+
7+
## Bug Fixes
8+
* Fixed an issue with passing arguments in System.launchExternalProcess
9+
10+
# Version 6.0.2.1
211

312
## New Features
13+
* Added Application.registerUser.
14+
* Upgrade JNA library to 4.5.1.
415

16+
# Version 6.0.1.3
17+
18+
## New Features
519
* Port discovery support on Mac and Linux with openfin-cli.
20+
* Add support for legacy connecting to Runtime by hard-coded port number
621

722
# Version 6.0.1.2
823

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>co.openfin</groupId>
6060
<artifactId>openfin-desktop-java-adapter</artifactId>
61-
<version>6.0.1.3-SNAPSHOT</version>
61+
<version>6.0.2.2-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>co.openfin</groupId>

‎release/embed.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -cp openfin-desktop-java-example-6.0.1.1.jar;openfin-desktop-java-adapter-6.0.1.1-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 -Dcom.openfin.demo.embed.URL=https://openfin.co -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo
1+
java -cp openfin-desktop-java-example-6.0.1.2.jar;openfin-desktop-java-adapter-6.0.2.1-SNAPSHOT.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 -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo

‎release/jna-4.5.1.jar‎

1.37 MB
Binary file not shown.

‎release/jna-platform-4.5.1.jar‎

2.22 MB
Binary file not shown.

‎release/junit.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ set RuntimeVersion="stable"
66
set RuntimeVersion="%1"
77
)
88

9-
java -cp openfin-desktop-java-example-6.0.1.2-tests.jar;openfin-desktop-java-adapter-6.0.1.3-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.2.2.jar;jna-platform-4.2.2.jar;json-20160810.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
9+
java -cp openfin-desktop-java-example-6.0.1.2-tests.jar;openfin-desktop-java-adapter-6.0.2.2-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20160810.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests

‎release/openfin-desktop-java-adapter-6.0.2.1-SNAPSHOT.jar‎

336 KB
Binary file not shown.

‎release/openfin-desktop-java-adapter-6.0.2.2-SNAPSHOT.jar‎

337 KB
Binary file not shown.

‎release/openfin-desktop-java-example-6.0.1.2-tests.jar‎

38 Bytes
Binary file not shown.

‎release/openfin-desktop-java-example-6.0.1.2.jar‎

-755 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)