Skip to content
This repository was archived by the owner on Apr 16, 2026. It is now read-only.

Merge develop into master #23

Merged
wenjunche merged 24 commits into from
Sep 6, 2018
Merged

Merge develop into master #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ab22a52
ADAP-114: adapter 6.0.1.3
wenjunche Dec 12, 2017
1bb3508
Merge branch 'develop' of https://github.com/openfin/java-example int…
wenjunche Dec 12, 2017
619c480
ADAP-115: Igore registerUser test for now
wenjunche Dec 12, 2017
be17ff4
ADAP-115: added Application.registerUser
wenjunche Dec 19, 2017
b2d1380
ADAP-120: Upgrade JNA to 4.5.1
wenjunche Feb 1, 2018
4ec3fa5
ADAP-120: updateed embed exampled
wenjunche Feb 2, 2018
a59c370
ADAP-122 Upgrade adapter to 6.0.2.2-SNAPSHOT
wenjunche Feb 15, 2018
5778503
ADAP-125: update RELEASENOTES-ADAPTER.md
wenjunche Mar 20, 2018
85463ed
ADAP-126: update adapter to 7.0.1
wenjunche Mar 20, 2018
c1de1e0
RUN-3975 added unit test case for IAB with reconnection. (#19)
weiteho Mar 29, 2018
8f2bce0
ADAP-130: adapter updates
wenjunche Apr 12, 2018
df481db
ADAP-130: update docs
wenjunche May 4, 2018
f121536
ADAP-134 fixed sample code that doesn't build with Java 10
weiteho May 14, 2018
33e16f3
ADAP-136: Adapter 7.0.1 release
wenjunche Jun 5, 2018
1b0e500
Merge branch 'develop' of https://github.com/openfin/java-example int…
wenjunche Jun 5, 2018
f8062ae
ADAP-139 updated embedded code and script, added description in readme
weiteho Aug 31, 2018
22cbf29
Merge pull request #21 from openfin/ADAP-139
weiteho Aug 31, 2018
3b59fa4
Update README.md
weiteho Aug 31, 2018
f8788da
Update README.md
weiteho Aug 31, 2018
6fc5ee1
ADAP-138: updated RELEASENOTES for 7.0.2
wenjunche Sep 5, 2018
b1eba29
Merge branch 'master' into develop
wenjunche Sep 5, 2018
c8cbf06
ADAP-138: Fixed fxdemo.bat
wenjunche Sep 6, 2018
2db92d2
Merge branch 'develop' of https://github.com/openfin/java-example int…
wenjunche Sep 6, 2018
817dcce
Merge branch 'master' into develop
wenjunche Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion release/fxdemo.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file added release/openfin-desktop-java-adapter-7.0.2.jar
View file
Open in desktop
Binary file not shown.