11502 Commits

Author SHA1 Message Date
Anthony Keenan
39bb3912a5 Fix merge issue 2018-04-18 11:37:38 +01:00
Anthony Keenan
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
Anthony Keenan
7db48de2b8
CORDA-1344 Fix query paging in scheduled flow tests ()
* Fix paging tests, move out of scheduled flow tests and provide java example

* Fix a few issues with docs
2018-04-18 11:10:21 +01:00
Shams Asari
60323cca15
CORDA-1312: Network bootstrapper copies any CorDapp jars into each nodes' cordapps dir () 2018-04-17 15:38:25 +01:00
cburlinchon
7789d5475f
Revert node suspend and resume () 2018-04-17 15:14:58 +01:00
Matthew Nesbit
0deed37569
Merge pull request from corda/mnesbit-shaded-zookeeper
Shade the zookeeper libraries to avoid version conflicts
2018-04-17 13:34:32 +01:00
Matthew Nesbit
1c169d035a Shade the zookeeper libraries to avoid version conflicts
Add comment to explain gradle logic
2018-04-17 12:07:09 +01:00
Patrick Kuo
0e663250ca
add old config annotation to doorman config () 2018-04-17 10:35:28 +01:00
Shams Asari
84ca67a5e3
Merge pull request from corda/os-merge-1288f63
O/S merge from 1288f63
2018-04-17 07:59:01 +01:00
Shams Asari
b6d43c0204 Merge remote-tracking branch 'open/master' into os-merge-1288f63
# Conflicts:
#	constants.properties
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
#	samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
2018-04-16 17:35:43 +01:00
Shams Asari
1288f63998
Fixed the CorDapp configuration demo () 2018-04-16 17:23:11 +01:00
josecoll
89aa2b57e5
Merged release notes, upgrade notes, and changelog from DP3 release branch to master. () 2018-04-16 16:05:08 +01:00
Tudor Malene
060fee84ab
Merge pull request from corda/merge/tudor_16_04_18 2018-04-16 15:02:12 +01:00
Patrick Kuo
fbdba41b07
ENT-1740 Make registration tool notary only to avoid confusion ()
* ENT-1740 Make registration tool notary only to avoid confusion

* address PR issues
2018-04-16 14:56:13 +01:00
Rick Parker
34f8719363
ENT-1766 Release soft locks inside the database transaction () 2018-04-16 13:51:50 +01:00
tudor.malene@gmail.com
47cc2f0bb1 Merge remote-tracking branch 'open/master' into merge/tudor_16_04_18 2018-04-16 13:32:01 +01:00
Tudor Malene
9d2b7f0b7b
CORDA-1313 RPC whitelist TransactionVerificationException () 2018-04-16 13:29:36 +01:00
Christian Sailer
408582cd05
OS -> R3 Corda up to CORDA-1336
OS -> R3 Corda up to d8bf1019b6c7ddbe709cff7c730e66eb576f9ad5
2018-04-13 18:09:30 +01:00
Tudor Malene
d34d599baf
fix url () 2018-04-13 16:58:19 +01:00
Christian Sailer
a0bf0261bb Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336 2018-04-13 16:39:00 +01:00
Christian Sailer
d8bf1019b6
CORDA-1336: Turn off direct delivery in Artemis via config ()
* CORDA-1336: Turn off direct delivery in Artemis via config - this can
deadlock when the server gets busy and switches back and forth between
direct and async delivery if it can't keep up.

* CORDA-1336: put in a comment explaining the config setting.
2018-04-13 16:17:24 +01:00
Patrick Kuo
7f8c36faa0
ENT-1586 Update entire service stack to support private network maps ()
* private network map
2018-04-13 15:54:53 +01:00
szymonsztuka
05ec885afd
Update integration test setup in database mode after OS->ENT merge ()
Added Notary schema for SQL setup to tests.
Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.
2018-04-13 15:28:07 +01:00
Katelyn Baker
f4ce31019e
Merge pull request from corda/kat-merge-180412
MERGE - 18 - 04 - 12
2018-04-13 14:39:15 +01:00
Konstantinos Chalkias
6f69f0252d
CORDA-1337 Crypto.registerProviders ()
CORDA-1337 Crypto.registerProviders + add BCPQC as well
2018-04-13 12:40:15 +01:00
Katelyn Baker
98b912e633 MERGE: OS Merge Fixes 2018-04-13 11:46:36 +01:00
Katarzyna Streich
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ()
Client private network map implementation

Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
2018-04-13 10:52:45 +01:00
Katelyn Baker
03478142ef MERGE: OS Merge Fixes 2018-04-13 10:44:10 +01:00
Michal Kit
a320c8d49f
ENT-1456 Adding try-catch to jira ticket processing ()
* Adding try-catch to jira ticket processing

* Addressing review comments

* Addressing review comments

* Refactoring getTransitionId method.

* Addressing review comments

* Refactoring to use requireNotNull

* Refactoring to use more requireNotNull

* Fixing missing map population
2018-04-13 07:46:16 +01:00
Katelyn Baker
5bb9514582 Merge remote-tracking branch 'open/master' into kat-merge-180412 2018-04-12 20:34:28 +01:00
Shams Asari
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. ()
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00
Shams Asari
179e479aa0
Merge pull request from corda/os-merge-f88542f
O/S merge from f88542f
2018-04-12 17:00:27 +01:00
Matthew Nesbit
8c1bc71a7d
Merge pull request from corda/mnesbit-publish-bridge-artifact
Include artifactory plugin in the bridge
2018-04-12 15:21:21 +01:00
Shams Asari
45d6bca071 Merge branch 'master' into os-merge-f88542f 2018-04-12 15:14:28 +01:00
Shams Asari
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
Patrick Kuo
80c075b19e
Merge pull request from corda/pat/ent-1323-cherrypick
ENT-1323 Network map service to check all identities in submitted node info
2018-04-12 14:04:47 +01:00
Patrick Kuo
eae7d1d3a6
CORDA-1159 Node attempts duplicate CSR if process terminates before receiving Request ID ()
* CORDA-1159 Node attempts duplicate CSR if process terminates before receiving Request ID
2018-04-12 13:53:17 +01:00
Katelyn Baker
842dd04b0c
Merge pull request from corda/kat/bug/listSetterSerialization
CORDA-1329 - Setter serialization fails with lists
2018-04-12 13:21:33 +01:00
Patrick Kuo
b5f304a104 ENT-1323 Network map service to check all identities in submitted node info ()
* ENT-1323 Network map service to check all identities in submitted node info

* fixup after rebase

* address PR issues, refactored createValidNodeInfo

* address PR issues

(cherry picked from commit f9ed55b)
2018-04-12 13:11:30 +01:00
Patrick Kuo
f9ed55b731
ENT-1323 Network map service to check all identities in submitted node info ()
* ENT-1323 Network map service to check all identities in submitted node info

* fixup after rebase

* address PR issues, refactored createValidNodeInfo

* address PR issues
2018-04-12 13:05:15 +01:00
Kat Baker
e6d352e446 Review comments 2018-04-12 12:09:17 +01:00
Kat Baker
03850dabc2 Review comments 2018-04-12 11:58:56 +01:00
Kat Baker
c783c431b1 Fix broken comment 2018-04-12 11:23:13 +01:00
Kat Baker
84914aa5c8 Remove commented out code 2018-04-12 11:18:39 +01:00
Katelyn Baker
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
Matthew Nesbit
7bee15374b Changes as suggested by Clinton 2018-04-12 10:55:08 +01:00
Matthew Nesbit
478e714936 Include artifactory plugin 2018-04-12 10:25:08 +01:00
Katelyn Baker
72bd530b11
Merge pull request from corda/kat/release/merge-3.1-releasenotes
Kat/release/merge 3.1 releasenotes
2018-04-11 16:50:19 +01:00
Tudor Malene
241f7738e4 ENT-1704 restructure db migration documentation () 2018-04-11 16:48:25 +01:00
Matthew Nesbit
c7937fa6f9
Merge pull request from corda/mnesbit-consume-filtered-messages
When discarding invalid messages we should consume them.
2018-04-11 16:38:27 +01:00