fafd8406fd
Merge commit 'd0d07287' into chrisr3-os-merge
2018-05-15 13:22:34 +01:00
759ed7c3d0
CORDA-1369 set co.paralleluniverse.fibers.verifyInstrumentation=true in devMode ( #3137 )
2018-05-14 17:26:08 +01:00
6e59a694c1
CORDA-1461 fix merge ( #3139 )
2018-05-14 16:39:44 +01:00
9b42dd3a87
Merge branch 'tudor_os_merge' into tudor_merge_14_05_2018
...
# Conflicts:
# constants.properties
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
2018-05-14 15:20:14 +01:00
543491c7df
CORDA-1461 improve devMode ( #3100 )
...
* CORDA-1461 improve devMode
* CORDA-1461 set devMode=true for driver
* CORDA-1461 fix tests and improve UI
* CORDA-1461 Address code review changes
* CORDA-1461 Missing developer emoji
* CORDA-1461 use latest cordform that sets devMode=true
* CORDA-1461 fix test and add driver overrides for notary
* CORDA-1461 fix tests, fix api-scanner version
* CORDA-1461 fix api
* CORDA-1461 formatting
* CORDA-1461 comment style
2018-05-11 17:48:02 +01:00
ce7ba2182b
Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6
2018-05-11 16:41:39 +02:00
bb62538d28
[CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix). ( #3119 )
...
* [CORDA-1394]: Meaningful message if required port is already in use.
* [CORDA-1394]: Meaningful message if required port is already in use.
2018-05-11 20:08:53 +07:00
54e1a7aa7e
Docs: fix some broken markup that caused rendering errors and warnings.
2018-05-11 13:02:40 +02:00
5e759f5025
Docs: remove things from ChangeLog that aren't of interest to end users.
2018-05-11 13:02:40 +02:00
5e0b27cfae
[CORDA-1445]: Raise proper error when starting node in devMode with compatibilityZoneURL. ( #3109 )
2018-05-10 22:00:47 +07:00
b4a402de36
Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18
2018-05-10 09:47:54 +01:00
3bb95c3ed1
Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) ( #3102 )
...
Also deprecated all the public members that shouldn't have leaked into the public API.
2018-05-09 21:42:55 +01:00
c369680ccb
[CORDA-1383]: Make SignedTransaction fully Jackson de/serialisable. ( #3097 )
2018-05-09 22:47:06 +07:00
8d6c54e2d5
Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge
2018-05-09 13:50:46 +01:00
96ab22f1da
Merge remote-tracking branch 'open/master' into kat-merge-20180508
2018-05-09 11:00:07 +01:00
d7ef385cc7
[CORDA-1395] [CORDA-1378]: Control the max number of transaction dependencies. ( #3047 )
2018-05-09 15:58:18 +07:00
5318c395ee
[CORDA-860]: Retrieving state by recordTime.max() throws a cast exception (fixed) ( #3090 )
2018-05-08 19:16:19 +07:00
406cdf39bb
Merge remote-tracking branch 'open/master' into kat-merge-20180508
2018-05-08 12:10:22 +01:00
b5e8dc5bd1
[CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState - FIX ( #3025 )
2018-05-04 22:37:56 +07:00
0784f079ed
Revert "OS merge ( #806 )"
...
This reverts commit 5c0775f7b4
2018-05-04 16:09:11 +01:00
5c0775f7b4
OS merge ( #806 )
2018-05-04 15:47:36 +01:00
100f680042
CORDA-1001 - Remove peristent map in NodeSchedulerService ( #763 ) ( #3076 )
...
* CORDA-1001 - Remove peristent map in NodeSchedulerService (#763 )
* Add scheduled flow test that uses multithreaded node
* Replace use of PersistentMap in NodeSchedulerService
* Correct class name and remove duplicate test
* Address initial PR comments
* Remove debugging code
* Remove acidentally added line
* Move Scheduled State contracts to internal module
* Put things in the right places
* Add changelog message
* Fix countdown issue
* Addressing PR comments
* Remove unused class
2018-05-04 15:04:52 +01:00
081b7251a7
CORDA-1001 - Remove peristent map in NodeSchedulerService ( #763 )
...
* Add scheduled flow test that uses multithreaded node
* Replace use of PersistentMap in NodeSchedulerService
* Correct class name and remove duplicate test
* Address initial PR comments
* Remove debugging code
* Remove acidentally added line
* Move Scheduled State contracts to internal module
* Put things in the right places
* Add changelog message
* Fix countdown issue
* Addressing PR comments
2018-05-04 11:35:01 +01:00
a61aa5d645
CORDA-847 - Pass serialization context down serialization call stack ( #3062 )
...
* CORDA-847 - Pass serialization context down serialization call stack
Needed for later work on AMQP RPC where we need to set per-thread
elements on a context. Could use some magic thread local but I'd rather
it was explicit on the stack and thus easier to reason about.
Additionally, now we're passing this around we can make better use of it
in the future
* Test Fix
* Test fixes
* REVIEW COMMENTS / CODE FORMAT
* Fix build issues
2018-05-03 16:09:03 +01:00
855f89b61e
Merge remote-tracking branch 'open/master' into andrius/os-merge
2018-05-03 13:37:39 +01:00
0d3c7e7762
CORDA-847 - RPC Server lib refactoring ( #3056 )
...
Just as we did for the RPC CLient, refactor kryo specific elements into
their own sub module. Also move kryo specific components out of generic
RPC files.
Thus, adding AMQP support will be a much smoother operation
2018-05-02 15:48:41 +01:00
3bf1e803d9
Move notary service related classes and interfaces in core to interna… ( #2827 )
...
* Move notary service related classes and interfaces in core to internal, since we won't be able to stabilise the APIs for writing custom notary services any time soon (the docs already mention it). I left out the wire protocol related classes so we don't accidentally break it.
2018-05-02 12:21:38 +01:00
e338414cd4
CORDA-847 - RPC Clent lib refactoring ( #3052 )
...
Move Kryo into it's own sub module
2018-05-01 20:52:19 +01:00
0c680ae530
CORDA-1403 - Generics serialization issue ( #3030 )
...
When implementing a generic interface subtype check fails, need
to compare to the actual raw type
2018-05-01 16:27:54 +01:00
92922b874c
[CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). ( #3043 )
2018-05-01 19:33:13 +07:00
5565b3e80d
[CORDA-1411]: Prevent MappedSchema caching from leaking memory. ( #3042 )
2018-05-01 19:32:29 +07:00
32b57feaa0
Update jolokia to 1.5.0 ( #2617 )
...
* Update jolokia to 1.5.0
* adding jolokia update to changelog
2018-04-30 10:24:08 +01:00
70b32636b5
Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
...
# Conflicts:
# docs/source/changelog.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. ( #3011 )
2018-04-27 15:33:13 +07:00
cec2f25c67
ENT-1627 - Allow to set hibernate.dialect setting for pluggable database ( #687 )
...
Optional property `database.hibernateDialect` which maps to `hibernate.dialect`.
2018-04-26 19:05:55 +01:00
071be31916
Resolve merge conflicts
2018-04-23 14:27:32 +01:00
f1fd1cefd8
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/corda-os-merge
2018-04-23 14:19:51 +01:00
3aaa176dd4
CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning ( #2977 )
...
* CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning
* CORDA-1355: Update change log
* CORDA-1355: Minor change to improve readability.
* CORDA-1355: Custom serializers documentation update to mention new system property.
2018-04-23 13:55:40 +01:00
af77c5a287
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418
...
# Conflicts:
# constants.properties
# docs/source/changelog.rst
2018-04-18 11:24:22 +01:00
60323cca15
CORDA-1312: Network bootstrapper copies any CorDapp jars into each nodes' cordapps dir ( #2974 )
2018-04-17 15:38:25 +01:00
89aa2b57e5
Merged release notes, upgrade notes, and changelog from DP3 release branch to master. ( #740 )
2018-04-16 16:05:08 +01:00
03478142ef
MERGE: OS Merge Fixes
2018-04-13 10:44:10 +01:00
5bb9514582
Merge remote-tracking branch 'open/master' into kat-merge-180412
2018-04-12 20:34:28 +01:00
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. ( #2954 )
...
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00
a83f3f3abe
Removing explicit waits for the default notary in driver tests.
...
This issue was fixed in https://github.com/corda/corda/pull/2947 .
2018-04-12 15:13:01 +01:00
03850dabc2
Review comments
2018-04-12 11:58:56 +01:00
f19bcea82f
CORDA-1229 - Setter serialization fails with lists
...
Looks like the super / sub type inference of setter param vs
getter param is the wrong way around. Also, Setter Type should
be the generic type, not just the type
the property must be a supertype of the setter parameter
the getter must be a supertype of the setter parameter
2018-04-12 11:17:26 +01:00
9b58114146
Merge remote-tracking branch 'open/master' into os-merge-f88542f
...
# Conflicts:
# docs/source/changelog.rst
# finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
2018-04-11 15:40:25 +01:00
760cc1ec48
RELEASE - merge v3.1 release notes / upgrade notes / changelog to master ( #2937 )
...
* RELEASE - 3.1 upgrade and release notes
* Update docs for change to vno
* address vno change in release notes
* Update release-notes.rst
* make corda links
* Review comments
* Review comments
* review comments
* remove ref to reverted bugfix
* Review comments
2018-04-11 13:57:29 +01:00
f6e79cdbea
Upgrade to H2 1.4.197. ( #2918 )
2018-04-11 13:38:06 +01:00
