Anthony Keenan
3ea03068b8
Update picocli to latest version ( #4241 )
2018-11-16 10:10:52 +00:00
Shams Asari
ac1d3d1fc7
Merge branch 'merge-point-e8b6f5f' into os-merge-e8b6f5f
...
# Conflicts:
# docs/source/api-persistence.rst
# docs/source/example-code/src/main/java/net/corda/docs/java/FlowCookbook.java
# docs/source/upgrade-notes.rst
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
2018-11-15 13:09:06 +00:00
Shams Asari
105adc9e8d
Merge pull request #1567 from corda/os-merge-shams
...
O/S merge 8e6d4b4
2018-11-15 10:43:54 +00:00
Joel Dudley
0e51d11743
Update CONTRIBUTORS.md
2018-11-15 09:49:59 +00:00
Joel Dudley
1d2b99f616
Removes a reference to an outdated JIRA ticket. ( #4238 )
2018-11-15 09:31:20 +00:00
Shams Asari
7696a570d1
Merge fixes
2018-11-14 18:50:29 +00:00
Konstantinos Chalkias
b8327ddf98
[CORDA-2225] Use platform's non-blocking PRNG when invoking SecureRandom() ( #4234 )
2018-11-14 18:32:22 +00:00
Andrius Dagys
e1e5d13941
CORDA-2221: Fix clustered notary identity generation ( #4230 )
...
- Don't generate a composite key certificate for CFT notaries
- Don't require a composite key certificate for CFT notaries on startup
2018-11-14 18:15:05 +00:00
Shams Asari
4984e92e31
Merge branch 'os-merge-point' into os-merge-shams
...
# Conflicts:
# build.gradle
# core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
# core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
# docs/source/api-persistence.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt
2018-11-14 18:13:01 +00:00
Hristo Gatsinski
eb9bd10da0
[CORDA-2219] Show message if CorDapp already exists ( #4236 )
...
* [CORDA-2219] Show message if CorDapp already exists
* Update definition of `net.corda.core.node.services.Vault$StateMetadata` in `api-current.txt` or else diff tool gets very confused.
2018-11-14 17:50:55 +00:00
Tommy Lillehagen
74aa51fee3
ENT-2661 - Publish health survey tool ( #1566 )
2018-11-14 16:48:10 +00:00
josecoll
70a1b48192
Merge pull request #1565 from corda/colljos-merge-141118
...
OS -> ENT merge 141118
2018-11-14 16:04:18 +00:00
Michele Sollecito
4059966ccb
[CORDA-2203]: Demobench ends up with a stuck tab when you unselect notary type for the first node. (fix) ( #4235 )
2018-11-14 14:42:57 +00:00
Shams Asari
e8b6f5f2f2
CORDA-2005: FinalityFlow has been made into an inlined flow to resolve issue with FinalityHandler ( #4050 )
...
FinalityHandler is insecure in that it is open to receive any transaction from any party.
Any CorDapp targeting platform version 4 or above is required use the new c'tors which take in FlowSession objects to the counterpart flow. This flow must subcall ReceiveFinalityFlow to receive and record the finalised transaction.
Old CorDapps (with target platform version < 4) will continue to work as previously. However if there are no old CorDapps loaded then the node will disable FinalityHandler.
2018-11-14 14:16:22 +00:00
josecoll
9bfa67de02
Remove duplicate declaration.
2018-11-14 13:53:29 +00:00
josecoll
6a4ef24f54
Merge commit '74c80aafd657e2718787f97932b89a069af7949f' into colljos-merge-141118
2018-11-14 13:52:56 +00:00
Tudor Malene
8e6d4b4b38
Merge pull request #4232 from corda/feature/tudor_constraints
...
Feature/tudor constraints
2018-11-14 13:33:39 +00:00
Christian Sailer
a08807b591
Ent-2570 Replace caffeine jitpack dependency ( #1564 )
...
* Use our caffeine version from artifactory
* Switch to use the 50% window version of caffeine
2018-11-14 13:28:34 +00:00
Tudor Malene
8f6047e3f8
fix merge
2018-11-14 12:06:30 +00:00
tudor.malene@gmail.com
1e27f0cbe0
Merge remote-tracking branch 'private/master' into feature/tudor_constraints
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
# core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
# core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
# node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
2018-11-14 11:50:19 +00:00
Michele Sollecito
8aaf120881
[CORDA-2224]: Removed field value
from Validated
. Renamed function orThrow()
to value()
. ( #4231 )
2018-11-14 11:19:38 +00:00
Viktor Kolomeyko
482277bad1
ENT-2689: Change SSL config structure ( #1551 )
...
* ENT-2689: Intent of the changes to be made (doesn't compile)
* ENT-2689: Propagate renaming of `customSSLConfiguration`
* ENT-2689: Documentation update
* ENT-2689: More renaming
* ENT-2689: Add a test for SSL keystores location override
* ENT-2689: Add V3 configuration compatibility unit tests (failing for now)
* ENT-2689: Add ability to read V3 configs.
* ENT-2689: Reflect changes on Integration tests.
* ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.
* Revert: ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.
And rename `p2pSslOptions` to `publicSSLConfiguration`.
* ENT-2689: Move V3 config structures into a separate file.
2018-11-13 16:34:41 +00:00
Michele Sollecito
aa0ccecfde
[CORDA-2172]: Add link to error-codes-webapp in Corda. ( #4224 )
2018-11-13 15:46:21 +00:00
Joel Dudley
f3b09988a9
Updates tutorial to reflect new template structure. Clean-up. ( #4216 )
...
* Initial improvements.
* Updates tutorials.
* Missing imports.
* Addresses review feedback.
2018-11-13 11:50:24 +00:00
Michele Sollecito
e2a351cb70
[CORDA-2123]: Unhandled IndexOutOfBoundsException for malformed Shell commands. (fix) ( #4225 )
2018-11-13 10:44:04 +00:00
Tommy Lillehagen
b456ed4ddd
ENT-2661 - Support material collection app ( #1559 )
...
* ENT-2661 - Support material collection app
* ENT-2661 - Do not escape JSON strings, better Windows output
2018-11-13 10:22:19 +00:00
Matthew Nesbit
44c8024c10
Merge pull request #1563 from corda/mnesbit-ensure-bridge-messages-acknowledged
...
CORDA-2206: Some code paths for bridge control are not being acknowledged
2018-11-13 10:20:09 +00:00
Konstantinos Chalkias
71117ebdad
[CORDA-2212] Better error on empty Party name fuzzy matching ( #4220 )
...
* typo - no matching
2018-11-12 19:34:21 +00:00
Shams Asari
1c012f6403
Back porting clean up of FlowFrameworkTests.kt made in ENT ( #4218 )
2018-11-12 18:38:47 +00:00
Anthony Keenan
369f23e306
CORDA-1817: Fix issue with misleading capsule error messages ( #4215 )
...
* Make caplet respect all acceptable combinations of cmd line parameters
* If cordapp dir fails to create, still run corda.jar and let it fail gracefully
* Don't parse additional options as the parameter for the previous one.
* Remove commented lines
2018-11-12 17:22:22 +00:00
Joel Dudley
bb0ed9e98c
Update CONTRIBUTORS.md
2018-11-12 17:15:19 +00:00
Michele Sollecito
dc62b20c5d
[CORDA-1879]: Ensure Node dies on unrecoverable errors. ( #4213 )
2018-11-12 15:56:04 +00:00
Matthew Nesbit
2600376773
Acknowledge all artemis messages
2018-11-12 14:01:45 +00:00
Michele Sollecito
ac23fcdf24
[CORDA-2208]: NodeHandles hashcode attemps an RPC invocation. ( #4217 )
2018-11-12 13:50:10 +00:00
Michele Sollecito
2f833f589c
Fixed missing entries for common modules in parent build.gradle
file. ( #4214 )
...
* Fixed missing entries for common modules in parent `build.gradle` file.
* Fixed publication names to match existing convention.
2018-11-12 13:38:35 +00:00
Shams Asari
fab0c5cd2c
Merge pull request #1561 from corda/os-merge-99e9864
...
O/S merge 99e9864
2018-11-12 12:37:31 +00:00
Matthew Nesbit
9b38a0b9d0
Merge pull request #1560 from corda/mnesbit-fix-bad-merge
...
Fixes a compile error due to a parallel change on master
2018-11-12 12:21:10 +00:00
Konstantinos Chalkias
23907c40d9
[CORDA-2210] Add matching party on the first X500 attribute match ( #4211 )
2018-11-12 11:59:04 +00:00
Shams Asari
2e9d7ce811
CORDA-2129: Ported changes in SingleThreadedStateMachineManager to MultiThreadedStateMachineManager
...
Introduced a new FlowFrameworkTestsUsingMultithreadedSMM test class to test the changes. In the process extracted out the multiple test classes in FlowFrameworkTests.kt.
2018-11-12 10:44:40 +00:00
Matthew Nesbit
4ca03abaac
Fix bad merge
2018-11-12 10:35:40 +00:00
Matthew Nesbit
d54e63e356
Merge pull request #1554 from corda/mnesbit-bully-leader
...
ENT-2705: A Bully Algorithm Leader Elector for the Bridge
2018-11-12 09:41:50 +00:00
Konstantinos Chalkias
81418ca7e7
[CORDA-2200][CORDA-2202] More tests for BCCryptoService and CryptoServiceException ( #4190 )
2018-11-12 09:38:06 +00:00
Matthew Nesbit
2caa082746
Some code paths for bridge control are now being acknowledged ( #4206 )
2018-11-09 17:54:51 +00:00
Roger Willis
4684259970
Expose JPA to flows ( #4140 )
...
* First pass
* Update test.
* Address review comments.
* Added docs and kdocs.
* Clean-up.
* Add extra test.
* Changes to docsite.
* Added try/catch block as recommended by Andras.
* Removed try catch block. It's not required as the checkpoint serialiser deals with this.
* Re-used existing DB session instead of creating a new session.
* Entity manager auto flushes.
* Added java friendly api.
* Addressed review comments.
2018-11-09 17:47:36 +00:00
Christian Sailer
65b8cbe9b1
Move cmd file to more suitable place
2018-11-09 17:55:15 +01:00
bpaunescu
7fbe8e7de7
renamed external artemis config properties for consistency ( #1555 )
2018-11-09 16:47:12 +00:00
Christian Sailer
30d90c50d1
Add cmd file to kill corda jobs on windows
2018-11-09 17:34:11 +01:00
Michal Kit
32ff24ddc7
ENT-2706 Fixing the CRL issuer cert lookup ( #1556 )
...
* ENT-2706 Fixing the CRL issuer cert lookup
* Addressing review comments
* Reverting imports
2018-11-09 16:20:00 +00:00
Roger Willis
2893271ab4
removed dupe companion object. ( #4207 )
2018-11-09 15:34:10 +00:00
Shams Asari
4801942a87
Merge branch 'merge-99e9864' into os-merge-99e9864
...
# Conflicts:
# .gitignore
# .idea/codeStyles/Project.xml
2018-11-09 14:53:26 +00:00