Skip to content

Commit f37970f

Browse files
wenjunchewenjunche
authored
Merge pull request openfin#17 from openfin/develop
ADAP-111: Merge Develop to master
2 parents 192513d + 575b9ab commit f37970f

21 files changed

+714
-111
lines changed

‎RELEASENOTES-ADAPTER.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Version 6.0.1.3
2+
3+
## New Features
4+
5+
* Port discovery support on Mac and Linux with openfin-cli.
6+
17
# Version 6.0.1.2
28

39
## Bug Fixes

‎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.2</version>
61+
<version>6.0.1.3-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>co.openfin</groupId>

‎release/jna-4.2.2.jar‎

1.08 MB
Binary file not shown.

‎release/jna-platform-4.2.2.jar‎

1.77 MB
Binary file not shown.

‎release/json-20160810.jar‎

53.2 KB
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.2.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;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.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

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

336 KB
Binary file not shown.

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

25.3 KB
Binary file not shown.

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

-6.29 KB
Binary file not shown.

‎release/run.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
java -cp openfin-desktop-java-example-6.0.0.3.jar;openfin-desktop-java-adapter-6.0.0.3-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.temp=%LocalAppData%\OpenFin\temp com.openfin.desktop.demo.OpenFinDesktopDemo
1+
java -cp openfin-desktop-java-example-6.0.1.2.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-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.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=8.56.26.48 com.openfin.desktop.demo.OpenFinDesktopDemo
2+

0 commit comments

Comments
 (0)