Merged release/4 (Corda OS version 4.1) into a branch created from master (Corda OS version 4.3)
Conflicts:
build.gradle
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
common/logging/build.gradle
common/logging/src/main/kotlin/net/corda/common/logging/CordaVersion.kt
constants.properties
core-tests/src/test/kotlin/net/corda/coretests/utilities/ProgressTrackerTest.kt
core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
docs/source/api-contract-constraints.rst
docs/source/api-stability-guarantees.rst
docs/source/app-upgrade-notes.rst
docs/source/changelog.rst
docs/source/clientrpc.rst
docs/source/conf.py
docs/source/corda-network/UAT.md
docs/source/getting-set-up.rst
docs/source/network-builder.rst
docs/source/upgrading-cordapps.rst
docs/source/versioning.rst
node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertyDescriptor.kt
serialization/src/main/kotlin/net/corda/serialization/internal/model/LocalTypeInformationBuilder.kt
tools/network-builder/src/main/resources/node-Dockerfile
tools/network-builder/src/main/resources/notary-Dockerfile
because there are still quite a few links to the old name and URL even
within our own repository.
Reformat docsite slightly to make the white papers more prominent.
Also link to the Chinese/Japanese translations of the old paper.
Make the build script do both platform/intro and tech white papers.
* Swap order of Java and Kotlin examples in HTML docs
* Nicer comment
* Put the hiding of kotlin examples back in the css file (so they start out hidden rather than being hidden when the JS runs - this could potentially make a difference with a large page over a slow connection)
* Updated corda release version to 1.0.0.RC2 (#1641)
* Fixed Simm Valuation Demo Test and enable serializabe java 8 lambdas. (#1655)
* [CORDA-624] Node Explorer on Issuing cash throws MissingContractAttachements exception (#1656)
(cherry picked from commit 27fea4d)
* BIGINT fix for H2 coin selection. (#1658)
* BIGINT fix for H2 coin selection.
* Review feedback
* CORDA-637 Node Explorer shows Network Map Service in Cash Issue dropdown (#1665)
* [CORDA-637] Node Explorer shows Network Map Service in Cash Issue dropdown
* add TODO to remove the hack
* Declare this internal message string as "const". (#1676)
* Merge "A variety of small fixes" into the 1.0 release branch (#1673)
* Minor: improve javadocs in NodeInfo
* Minor: use package descriptions in Kotlin build of api docs too, not just javadocs.
* RPC: make RPCConnection non-internal, as it's a core API. Move docs around so they're on public API not internal API.
* Add an IntelliJ scope that covers the currently supported Corda API.
This is useful when used in combination with the "Highlight public
declarations with missing KDoc" inspection.
* Ironic: upgrade the version of the Gradle plugin that checks for upgraded versions of things.
It had broken due being incompatible with the new versions of Gradle
itself.
* Docs: flesh out javadocs on ServiceHub
* Docs: add @suppress to a few things that were polluting the Dokka docs.
* Docs: mention RPC access in NodeInfo javadoc
* IRS Fixes to bring UI closer to declared financial types (#1662)
* Made problematic CordaRPCClient c'tor private (with internal bridge methods) and added correct c'tors for public use. (#1653)
initialiseSerialization param has also been removed.
* Fixing flow snapshot feature (#1685)
* Fix validating notary flow to handle notary change transactions properly. (#1687)
Add a notary change test for checking longer chains involving both regular and notary change transactions.
* Unification of VaultQuery And VaultService APIs (into single VaultService interface) to simplify node bootstrapping and usability. (#1677) (#1688)
* Identity documentation (#1620)
* Sketch initial identity docs
* Restructure confidential identity docs to better fit structure
* Split confidential identities into API and concepts
* Further expansion on basic identity conceptS
* Merge Party type into api-identity.rst
* Address feedback on written content
* Rework inline code with literalinclude
* Start addressing feedback from Richard
* Clarify use of "counterparty"
* Address comments on key concepts
* Correct back to US english
* Clarify distribution/publishing of identities
* Update changelog around confidential identities
* CORDA-642 Notary demo documentation fixes (#1682)
* Notary demo documentation fixes.
* One of the tables is prefixed.
* CORDA-641: A temporary fix for contract upgrade transactions (#1700)
* A temporary fix for contract upgrade transactions:
during LedgerTransaction verification run the right logic based on whether
it contains the UpgradeCommand.
* Move ContractUpgradeFlowTest away from createSomeNodes()
* Remove assembleBareTx as it's not used
* Update corda version tag to 1.0.0-RC3 (#1705)
* Hide SerializationContext from public API on TransactionBuilder (#1707)
* Hide SerializationContext from public API on TransactionBuilder
(cherry picked from commit 6ff7b7e)
* Hide SerializationContext from public API on TransactionBuilder
(cherry picked from commit 6ff7b7e)
* Address feedback on confidential identities docs (#1701)
* Address minor comments on confidential identities docs
* Expand on implementation details of confidential identities
* Cleanup
* Clarify details of the data blob in the swap identites flow
* Add that certificate path is not made public for confidential identities
* FlowSession docs (#1693)
* FlowSession docs (#1660)
* FlowSession docs
* PR comments
* Milder example flow name
* Fixes bugs with contract constraints (#1696)
* Added schedulable flows to cordapp scanning
Fixed a bug where the core flows are included in every cordapp. Added a test to prove the scheduled flows are loaded correctly. Added scheduled flow support to cordapp.
Renabled broken test.
Fixed test to prove cordapps aren't retreived from network.
Review fixes.
Fixed a test issue caused by gradle having slightly different paths to IntelliJ
* Fixed test for real this time.
* Consistent use of CordaException and CordaRuntimeException (#1710)
* Custom exceptions in corda, should either derive from an appropriate closely related java exception, or CordaException, or CordaRuntimeException. They should not inherit just from Exception, or RuntimeException.
Handle PR comments
Add nicer constructors to CordaException and CordaRuntimeException
* Fix ambiguous defaulted constructor
* Add @suppress (#1725)
* Git-ignore Node Explorer config. (#1709)
* add message warning windows users they might need to manually kill explorer demo nodes started by gradle (#1717) (#1726)
* Misc documentation fixes (#1694)
(cherry picked from commit 592896f)
* Document -parameters compiler arg for Java CorDapps. (#1712)
* Correct non-anonymous two party trade flow (#1731)
* Parameterize TwoPartyTradeFlowTests to confirm deanonymised functionality works.
* Correct handling of counterparty using well known identity in TWoPartyTradeFlow
* CORDA-594 - SIMM Demo doc update (#1723) (#1735)
* CORDA-594 - SIMM Demo doc update
For V1 write a series of JSON / curl commands a user can follow to run
the demo
* Review Comments
* Updated the rationale behind as to why SIMM was introduced.
* typo
* Cordapps now have a name field. (#1664)
Corrected cordapp name generation.
Added changelog entry.
* Small API fixes against M16 (#1737)
* Move CompositeSignaturesWithKeys into net.corda.core.crypto package.
(cherry picked from commit 8f29562)
* Rename and move CordaPluginRegistry to reflect its real purpose now.
Simplify serialization code a bit.
(cherry picked from commit e2ecd3a)
* Docs: docsite improvements
* Remove discussion of webserver from 'writing a cordapp' page.
* Fixup some flow docs.
* Add a couple more package descriptions.
(cherry picked from commit 2aedc43)
* Review comments
(cherry picked from commit ba1d007)
* Review comments - always apply default whitelist and no longer load it via ServiceLoader
(cherry picked from commit 7d4d7bb)
* Added wording about renaming services resource file
* Update corda version tag to 1.0.0-RC4 (#1734)
* Update corda version tag to 1.0.0-RC3
* Update corda version tag to 1.0.0-RC4
* Update build.gradle
* V1 tests and fixes for the ContractConstraints work (#1739)
* V1 tests and fixes for the ContractConstraints work
* More fixes.
* Added a contract constraints section to the key concepts doc. (#1704)
Documentation for contract constraints.
Added to index.
Review fixes round 1.
More review fixes.
Review fixes.
Explained package contents.
review fixes.
Addressed RGB's final review comments.
Updated source code type to 'java'
* Fixes dead links. (#1749)
* Update gradle plugins version to 1.0.0 (#1753)
* Update Readme (#1756)
* Update Readme
Minor tweaks to Readme -- consistent capitalisation and more descriptive list of features (also reordered to put the important things first)
* Copied master readme.
* Update Readme
Minor tweaks to Readme -- consistent capitalisation and more descriptive list of features (also reordered to put the important things first)
* Fixes .rst formatting. (#1751)
* Updates tutorials. (#1649)
* Updates tutorials.
* Addresses review comments.
* Tutorial refresh for v1.0 and moving of code into separate files. (#1758)
* Moves code sections in tutorials to code files.
* Removes wallet references.
* Updates repo layout doc.
* Removes remaining cordapp-tutorial references, replaced with cordapp-example.
* Fixes broken link.
* Misc docs fixes.
* Refreshes the ServiceHub and rpc ops api pages.
* Updates the cheat sheet.
* Updates cookbooks.
* Refreshes the running-a-notary tutorial.
* Updates flow-testing tutorial
* Updates tear-offs tutorial.
* Refreshes integration-testing tutorial.
* Updates to contract tutorial and accompanying code to bring inline with V1 release.
* Refreshes contract-upgrade tutorial.
* Fixed broken code sample in "writing a contract" and updated contracts dsl.
* Added contract ref to java code. Fixed broken rst markup.
* Updates transaction-building tutorial.
* Updates the client-rpc and flow-state-machines tutorials.
* Updates the oracles tutorial.
* Amended country in X500 names from "UK" to "GB"
* Update FlowCookbook.kt
* Amended cheatsheet. Minor update on contract upgrades tutoraial.
* Added `extraCordappPackagesToScan` to node driver.
* Changes to match new function signature.
* Update to reflect change in location of cash contract name.
* CORDA-670: Correct scanned packages in network visualiser (#1763)
* Add CorDapp dependency of IRS to network visualiser
* Set CorDapp directories
* Checking out the latest milestone will no longer be required. (#1761)
* Updated documentation indices (#1754)
* Update documentation indices.
* Reference a moveable tag for V1 docs.
Remove redundant warning text.
* Reverted proposed usage of new docs release tag
* Minor: print a deprecation warning when the web server starts. (#1767)
* Release and upgrade notes for V1.0 (#1736)
* Release and upgrade notes for V1.0
* Update changelog.rst
* Update changelog.rst
* Formatting.
* Incorporating review feedback from KB and MN.
* "guarantee" instead of "promise"
* Updated with final review comments from KB and RGB.
* Updated upgrade notes to describe migration from removed CordaPluginRegistry.
* Minor clarification.
* Minor updates following final RGB feedback.
* Kat's further pedantic feedback
* Minor changes following feedback from KB.
* Incorporating review feedback from MH.
* killed 'patent-pending'
* Made the visualiser into a regular JVM module - not a CorDapp. (#1771)
* Docs: more package descriptions and take non-stabilised APIs out of the docs build. (#1775)
* Update corda version tag to 1.0.0
* Updated release notes to fix minor typos (#1779)
Fixed bold type on simplified annotation driven scanning bullet and added bold type to module name bullets
* Fixed drop down.. probably. (#1780)
* fixed formatting for release notes. (#1782)
* Improve API page wording (#1784)
* Removed "unreleased" sections from the release notes and change log.
* Merge remote-tracking branch 'origin/release-V1' into colljos-merge-v1-docs
# Conflicts:
# build.gradle
# client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/PermissionException.kt
# constants.properties
# core/src/main/kotlin/net/corda/core/flows/FlowSession.kt
# core/src/test/kotlin/net/corda/core/contracts/DummyContractV2Tests.kt
# core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt
# docs/source/api-flows.rst
# docs/source/api-index.rst
# docs/source/changelog.rst
# docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/contract/TutorialContract.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt
# docs/source/hello-world-state.rst
# docs/source/key-concepts-contract-constraints.rst
# docs/source/serialization.rst
# docs/source/tut-two-party-flow.rst
# docs/source/tutorial-tear-offs.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/CordaClassResolver.kt
# node-api/src/test/java/net/corda/nodeapi/internal/serialization/ForbiddenLambdaSerializationTests.java
# node-api/src/test/java/net/corda/nodeapi/internal/serialization/LambdaCheckpointSerializationTest.java
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/test/kotlin/net/corda/node/internal/cordapp/CordappLoaderTest.kt
# node/src/test/kotlin/net/corda/node/services/NotaryChangeTests.kt
# samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt
# samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/FlowStackSnapshotTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
