17 Commits

Author SHA1 Message Date
Michele Sollecito
31e58dd2e5 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 11:20:34 +01:00
Mike Hearn
97aef9c8a1 Merge remote-tracking branch 'open/master' into mike-merge-f6ee263db10 2018-09-03 20:13:38 +02:00
Shams Asari
11e2bef240
ENT-2473: Removed copyright headers (#1364) 2018-09-03 16:38:52 +01:00
rick.parker
21a7b56161 Fix up compilation errors. 2018-07-13 14:33:13 +01:00
Shams Asari
0c8c914882 Removing warnings 2018-07-05 15:45:28 +01:00
Viktor Kolomeyko
ab3974ed60
Switch dependencies to rpcProxyCompile. (#1173)
The problem manifests itself in IntelliJ when full rebuilt is performed with Gradle delegation.
In this case IntelliJ executes the following tasks:
`:testing:qa:behave:tools:rpc-proxy:classes`, `:testing:qa:behave:tools:rpc-proxy:testClasses`, `:testing:qa:behave:tools:rpc-proxy:smokeTestClasses` and `:testing:qa:behave:tools:rpc-proxy:rpcProxyClasses`

Without the change when `rpcProxyClasses` task executed - the build fails.

The problem is likely to be caused by the fact that this is a multi-sourceSets project.
2018-07-02 17:08:55 +01:00
szymonsztuka
56e1f6c650 CORDA-1407 Node Explorer - fix total column 2018-06-19 12:21:40 +01:00
Tommy Lillehagen
a612ca234a Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613 2018-06-13 21:45:00 +01:00
Shams Asari
b2f41d82f9 Merge fixes 2018-05-21 11:25:13 +01:00
Katelyn Baker
8c9773fc13 Merge build fix - add AMQP to RPC Proxy Web 2018-05-18 14:27:38 +01:00
Katelyn Baker
4ed3d779b0 merge build fix 2018-05-18 11:16:45 +01:00
Katelyn Baker
1cfc9c6e0c Post merge cleanup for Max Mem Size 2018-05-18 09:54:56 +01:00
josecoll
4afc7f3824
Behave: fix compilation problem in IntelliJ (#830)
* Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy.

* Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.
2018-05-11 15:21:42 +01:00
Andrius Dagys
524ba27721 Fix merge issues 2018-05-03 13:52:11 +01:00
josecoll
f013c1dcb7 Address remaining PR review comments. 2018-05-02 11:09:25 +01:00
josecoll
ccd5f5fd5b Re-apply previous fixes. 2018-05-02 10:47:12 +01:00
josecoll
764af04608 Moved RPC Proxy to own module in testing/qa/behave/tools
Incorporating PR review feedback.

Minor fixes to default path and additional copying of startup script.
2018-05-01 17:04:46 +01:00