Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish tools to Artifactory: Blob Inspector, Network Bootstrapper #3321

Merged
merged 4 commits into from Jun 8, 2018

Conversation

josecoll
Copy link

@josecoll josecoll commented Jun 7, 2018

Adding publication to Artifactory of following tools:

  • network bootstrapper
  • blob inspector

Clean-up redundant references.

@josecoll josecoll changed the title Publish tools to Artifactory Publish tools to Artifactory: Blob Inspector, Network Bootstrapper Jun 7, 2018
@josecoll josecoll requested review from shamsasari and tlil June 7, 2018 14:38
@@ -21,7 +21,6 @@ include 'experimental:behave'
include 'experimental:sandbox'
include 'experimental:quasar-hook'
include 'experimental:kryo-hook'
include 'experimental:blobinspector'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh!

@@ -18,11 +20,15 @@ jar {
exclude "META-INF/*.DSA"
exclude "META-INF/*.RSA"
}
baseName 'blobinspector'
archiveName = "blob-inspector-${version}.jar"
manifest {
attributes(
'Automatic-Module-Name': 'net.corda.blobinspector',
'Main-Class': 'net.corda.blobinspector.MainKt'
)
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ENT PR also publishes the database migration tool (which doesn't exist in OS).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think he was referring to this jar-block :)

jar {
    classifier "ignore"
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK - yes, so confirmed with @Clintonio that this additional is not required in this scenario.

manifest {
attributes(
'Automatic-Module-Name': 'net.corda.blobinspector',
'Main-Class': 'net.corda.blobinspector.MainKt'
)
}
}

publish {
name 'tools-blob-inspector'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly there's a disableDefaultJar = true in ENT

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seem to be different though 👍

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed with @Clintonio.
That directive should not be included when publishing the default jar (so its more clean-up than anything else).

@shamsasari
Copy link
Contributor

@josecoll josecoll merged commit 002d5a8 into master Jun 8, 2018
@shamsasari shamsasari deleted the colljos-publish-tools branch July 10, 2018 15:47
Clintonio pushed a commit that referenced this pull request Sep 28, 2018
…3321)

* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.
fenryka pushed a commit that referenced this pull request Oct 2, 2018
…nary list (#4003)

* Publish tools to Artifactory: Blob Inspector, Network Bootstrapper (#3321)

* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.

* Fix bootstrapper publication problem. (#3370)

* Fixed double JAR publishing problem with network bootstrapper. (#3354)

Fixed merge issue
roastario pushed a commit to roastario/corda that referenced this pull request Nov 8, 2018
…orda#3321)

* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.
egeek pushed a commit to egeek/corda that referenced this pull request Feb 13, 2019
…corda#2442)

CORDA-943 - Deterministic serialization order breaks object ref cache

CORDA-976 - V3.0 release version bump (#2456)

* CORDA-976 - V3.0 release version bump

* Reflect discussed changes to external version number

set network registration poll interval via http cache control header (#434) (#2445) (#2471)

* set network registration poll interval via http cache control header from the server side

* default poll interval to 10 seconds if cache header not found

* address PR issues

* address PR issues

(cherry picked from commit dca8699)

(cherry picked from commit 258b562)

CORDA-915 - Replace BEANS introspector with standard reflection (#2400)

* CORDA-915 - Replace BEANS introspector with standard reflection

Removes lib dependency and puts something in place we can better
control

* CORDA-915 - Review comment corrections

* Review Comments

CORDA-978 - Getter selection fix

Backport from master - only select getters that take no parameters

CORDA-946 - Correct backward compatibility issue with fingerprinting

Backport from Corda master

CORDA-904 - Fix evolver to work with setter instantiated classes

Backport from master

CORDA-979 - Make public java setter accessible from within Java

Backport from master

CORDA-915 - small bug fix

CORDA-904 - Fix evolver to work with setter instantiated classses (#2463)

- Cherry pick to backport from master

* CORDA-904 - Make evolver work with classes that use setters

* review comments

* review comments

* small fixs

* don't include systemTest in compiler.xml

CORDA-988 - Added basic node configuration validation.

Tolerate duplicates to prevent a PK violation. (#2460)

CORDA-939 - Dont expose FlowStateMachine via public API (#2438) (#2476)

* CORDA-939 - Dont expose FlowStateMachine via public API (#2438)

* Create CordaInternal attribute for properties on public classes that are not part of the api and apply to FlowLogic.stateMachine

* Remove startFlow from public test api and replace with startFlowAndReturnFuture

* Update api-current with changed signature

* Change test used in documentation to use public test methods

* Remove the rest of the unneccessary usages of the startFlow test utility

* Remove extra whitespace

* Rename startFlowAndReturnFuture back to startFlow

* Update api

* The annotation doesn't appear unless its marked as on the actual getter and setter

* Updated docs and removed pointless attribute

* Deleted whitespace

* Revert api-current to v1 api

* Adding missing line and missing annotations

* Made changes post review

* Minor text change

First approach to network parameters updates (#2412) (#2487)

* Network parameters updates

Add two RPC methods networkParametersFeed and
acceptNewNetworkParameters. Implementation of client handling of network
parameters update event. Partial implementation of accepting new
parameters and installing them on the node as well as node startup with
updated parameters.

Move reading of network parameters on startup to separate
NetworkParametersReader class. Add tests.

Move NetworkParameters and NotaryInfo classes to core.

* Ignore evolvability test - to be fixed later

* Add documentation on update process

CORDA-961 Wire up and enforce max transaction size (#2465) (#2493)

* wire up and enforce max transaction size

* fixup after rebase
moved network parameter from AbstractNode to NodeProperties

* removed TODO

* fix broken import

* address PR issues

* remove API breaking change
address PR issue

* added max transaction size to driver and mock network.
address PR issues

* fix failing test

* added TODO

* fix verifier test

* fix spring driver build error

(cherry picked from commit c8cf46c)

CORDA-995: r3corda wire compatibility (#2497)

CORDA-1003: Fix duplicate detection on cache evict (#2499)

CORDA-939 - Don't expose StartedNode and AbstractNode as part of public test api (#2472) (#2505)

* Don't expose StartedNode via Node Driver

* Dont expose StartedNode/Abstract Node via MockNetwork

* Remove internal var from constructor as it doesn't hide from public api and change to internal initialisation method

* Update api

* Rename MockNode to StartedMockNode to avoid confusion
Update documentation
Update api-current.txt

* Fix typo

* Fix test failure

* Modify flow tests to use internal mock network and remove additional internal exposures from StartedMockNode

* Fix api-current

* Change InProcess and OutOfProcess to interfaces

* Explicitly declare MockNetwork parameters
Dont expose StateMachineManager
Move affected tests to use internal mock network

* Fix api-current

* Changes requested via review

* Fix IRS Demo address

* Fix api

* Remove internal attribute from classes in internal package

* Remove accidentally added code

* Move useHttps into NodeHandleInternal

* Remove duplicated code

* Update api-current

* Make webAddress internal on NodeHandle

* Make sure parameters in public api are explicitly specified

* Use correct address in IRS Demo

* Get webaddress from webserver handle

* Update api-current

CORDA-990 - Flows Draining Mode (#2507)

* [CORDA-990]: Flows Draining Mode

* Fixed incorrect disconnect login.

* Code review changes.

* Fixed compilation error about MockNetwork...

* Fixed compilation error about MockNetwork...

* Fixed broken compilation.

* Ignoring an unstable test.

CORDA-716 - Update changelog for test package changes and provide upgrade script (#2434) (#2515)

* Update changelog for test package changes and provide upgrade script

* Upgrade kotlin and java scripts

CORDA-967 - Allow multi-tx signature verification (#2495)

* Allow multi-tx signature verification

* remove empty line

* CORDA-967 Allow multi-tx signature verification

Docker system (end-to-end) test (#2437) (#2518)

* System test for IRS Demo utilizing docker, docker-compose and PhantomJS to automate full-stack testing

(cherry picked from commit a9856b9)

CORDA-1006: Undoing the wiring of maxMessageSize as it's not correctly implemented and updating the docs to clarify its status. (#2501)

The network parameter was just fed into Artemis' minLargeMessageSize property which isn't the same thing.

No IdentityServiceInternal as public param. Start nodes without params. Simpler MockServices ctors. (#2521)

* Removes IdentityServiceInternal as a public parameter to MockServices.

* Reorders params to put non-default args first. Creates simpler default constructors.

* Adds constructors for creating mock nodes by passing params.

CORDA-1008 - Samples fail to run due to wrongly configured max transaction size in the network bootstrapper (#2509) (#2514)

* [CORDA-1008] - Samples fail to run due to wrongly configured max transaction size in the network bootstrapper

* address PR issues

(cherry picked from commit ddf0d34)

CORDA-1007 - Tweak the way invocation context is integrated to reduce the pain for devs using the old API (#2447) (#2524)

Minor tweaks to the invocation context code.

1) Un-deprecate FlowInitiator, move the deprecation to the field. This
   eliminates large numbers of warnings and means developers are warned
   only once in the place where they obtain one.

2) Add documentation for StateMachineInfo and create a type alias to give
   it a better name in an ABI compatible way.

3) Improve markup on InvocationContext

4) Rename field from just "context" to "invocationContext" (Context is vague)

CORDA-1016 - Demobench now writes a node.conf that is compatible with current Corda. (#2526)

* Demobench now writes a node.conf that is compatible with current Corda.

* Demobench now writes a node.conf that is compatible with current Corda.

* fixed broken compilation

CORDA-939 - Remove sslConfiguration from public constructor of CordaRPCClient (#2522) (#2529)

* Remove sslConfiguration from public constructor of CordaRPCClient

* Address review comments

* Update api-current.txt

* sslConfiguration doesn't need to be a property

Test driver default parameters removal (#2519) (#2525)

* Removed long parameter list in test driver, replaced with DriverParameters object

(cherry picked from commit b91dd43)

CORDA-1032 - unnamed ctor param serialization issue (#2535)

CORDA-1011 Add powershell script to update testing package imports (#2528) (#2549)

* Add powershell script to update testing package imports

* Make sure script works with java files

* Address review comments

CORDA-966 - RELEASE - Rename current build version to reflect health check status (#2556)

DOCS: AMQP Serialization "gotcha" (#2555)

How to deal with the case where the constructor parameter doesn't map to
a class property

CORDA-1038 - docs fix: TransactionWithSignatures (#2552)

CORDA-939 - Modify Api Scanner to check api for internal exposures (#2534)

* CORDA-939 Modify Api Scanner to check api for internal exposures (#2510)

* Update check api changes to look for internals

* Update several more uses of internal

* Make check-api-changes script filter out internal class usages

* Make CordaClock part of API

* Update api-current.txt

* Remove exclusion of nodeapi.internal

* Remove access to CordaPersistence from public api

* Don't expose DB Connection from StartedMockNode and remove unnecessary transaction from CustomVaultQueryTest

* Make internal tests that use need db access use InternalMockNetwork

* Make test certificates internal

* Address further review comments

* Revert some accidental changes to api-current.txt

* Address Shams' review comments

* Update Api Scanner to filter out CordaInternal attribute

* Update api-current.txt

* Remove superfluous brackets

* Add transaction to StartedMockNode

* More leaky transaction fixes

* Bump gradle plugins version

* One last internal exposure

* Update constants.properties

* Fix api-current

* Address mikes review comments

ENT-1519 - Ensure NodeInfo always has at least one address by checking in the c'tor (#2538) (#2542)

Further, the look up of the node's own node-info from its database has been tightened to ensure there isn't more than one.

Also fixed some brittle code which was assuming exactly one address rather than at least one.

(cherry picked from commit 2864ce1)

Minor: reduce the size of the MockNetwork API a bit, add some better documentation

CORDA-1064 - Fix a hang in AMQP protocol code that occurs when pausing in debugger causes protocol timeout, but wasn't driving event procesing to actuially kill the socket. (#2557) (#2559)

The IRS demo has a clash between web server ports and the regulator node on port 10010. This bumps the ports up by 1 to fix the issue. (#2562) (#2564)

Renames plugins folder to cordapps

CORDA-961 - Revert the introduction of GlobalProperties.

 * Changes to LargeTransactionTests.
 * Code review changes.
 * Code review changes.
 * Code review changes.
 * Reverted to MAX_FILE_SIZE for Artemis.
 * reverted max message size for BridgeControlListener inside Node.kt
 * reverted max message size for BridgeControlListener inside Node.kt
 * Renamed setNetworkParameters to withNetworkParameters in MockNetwork.kt
 * Updated to reflect latest state.

Changed the wither methods in DriverParameters and NodeParameters to begin with "with" and not "set" (#2570) (#2571)

(cherry picked from commit ad959c7)

CORDA-941 - Add Network Parameters contract implementation Whitelist (#2539)

* CORDA-941 Add Network Parameters contract implementation Whitelist

* CORDA-941 fix merge

* CORDA-941 added uploader support to Attachments and added check into the AttachmentClassloader to only allow loading attachments that were uploaded from the local cordapps folder

* CORDA-941 update api spec

* CORDA-941 address some code review changes and fix and add classloader test

* CORDA-941 fix test

* CORDA-941 address code review comments

* CORDA-941 address code review comments - use and update existing whitelist

* CORDA-941 address code review comments

* CORDA-941 fix compile error

* CORDA-941 address code review comments

* CORDA-941 removed: whitelistAllContractsForTest

* CORDA-941 removed: whitelistAllContractsForTest

* CORDA-941 add comment

* CORDA-941 remove toLedgerTransaction

* CORDA-941 add warning when node not using latest CorDapp

* CORDA-941 remove the stubbing approach for cleaning LedgerTransaction

* CORDA-941 Code review changes

* CORDA-941 Fix merge

* CORDA-941 workaround for api scanner bug

* Fixed JacksonSupportTest.

CORDA-1010 - Send a request signature in addition to a transaction to the notary (#2573)

* Make NotaryFlow.Client more modular and easier to customise

* CORDA-1010: Send a request signature in addition to a transaction to the notary (#2527)

CORDA-1010: Notary flow - clients now send a signature over a notarisation
request in addition to the transaction. This will be logged by the notary
to be able to prove that a particular party has requested the consumption
of a particular state.

DOCS - Separate parameter names in exceptions in a clear fashion (#2578)

Removed DriverParameters.initialiseSerialization (#2572) (#2576)

(cherry picked from commit 979aef1)

CORDA-1059 - Fix Driver hanging on duplicate node names. (#2574)

* [CORDA-1059]: Fix bug with Driver hanging on duplicate node names.

* [CORDA-1059]: Code review changes.

* [CORDA-1059]: Code review changes.

DOCS - Bring doc improvements for v3 across from master (#2593)

* Docs: some work on the network map docs.

* Address review comments

* Address review comments

* Docs: discuss zone constraints, flow drains and more upgrade related topics (#2585)

Docs: discuss zone constraints, flow drains and more upgrade related topics.

CORDA-984 - Add RPC deduplication to client and server (#2582)

CORDA-941 - Instead of storing the network map contract implementation whitelist along with (#2581)

the constraint, pass it in during verification on LedgerTransaction

[CORDA-1089]: Correctly display an error message on node startup if RPC settings are invalid (#2592)

* [CORDA-1089]: Correctly produce an error message on node startup if rpc options are invalid.

* [CORDA-1089]: Made RPC settings validation only trigger if address is specified.

* [CORDA-1089]: Fixed outdated deployNodes task in build.gradle.

* [CORDA-1089]: Fixed outdated deployNodes task in build.gradle.

CORDA-1080 - Doc update to make instructions clearer (#2598)

CORDA-1085 0 Alter column names to be consistent with R3.Corda. (#2601)

CORDA-1075 -  Add "bye" and "help" to crash shell menu(#2600)

* shell: list commands alphabetically

* increased crash shell version

* crash shell with help and bye

Update deploying-a-node.rst

CORDA-1096 - Performance when loading multiple states from the vault (#2609)

* Provide efficient `loadStates()` implementation

* Replace loops using `loadState` with calls to `loadStates`

CORDA-696 - Create separate transaction types for contract upgrade transactions (#2589)

* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467)

* CORDA-696: Create separate transaction types for contract upgrade transactions.

Add rationale around upgrade transactions

Move contract upgrade transaction resolution logic into internal until it's stabilised.

Throw a better exception when contract attachment not found

Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging

Introduce a new upgraded contract interface that allows specifying the legacy constraint.

Remove StateLoader, make all tx resolution functions take in ServicesForResolution

Contract upgrade transactions can handle whitelist by zone constraints

When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.

CORDA-1047 - Dockerform documentation (#2544)

* Comments update

* Links fix

* Grammar

CORDA-1043 - recieveAll documentation (#2611)

* CORDA-1043

* Update API

CORDA-1098 - Fixed Artemis filters for flows draining mode. (#2612)

RELEASE: Bump release version for RC (#2618)

CORDA-696: Update upgrade docs (#2619)

CORDA-2615 - Added description for configFile option in deployNodes Cordform Gradle task. (#2615)

* Added description for configFile option in deployNodes Cordform Gradle task.

* Addressing PR comments.

* Addressing PR comments.

* Addressing PR comments.

* Addressing PR comments.

* Addressing PR comments.

[CORDA-1035] Flow test API docs.

CORDA-1040 - docs for FlowLogic.sleep (#2625) (#2638)

(cherry picked from commit 2da28c5)

Updates shell example of starting flow to reflect cash API change.

Showcase link in Quickstart guide. Remove Utilities link (merged with Samples).

Wrong file name.

CORDA-1119 - Sign in DB transaction (#2651)

Fix rpc sender thread busy looping (#2655)

GITHUB-2630 - missing rpc info at node startup (#2656)

CORDA-1116 - Move classpath to a system variable so it can overcome command limits on Windows, while keep working fine on other system. (#2660)

(cherry picked from commit 30e2c7d)

CORDA-1113 - Close classloader (#2637)

* Close classloader after use

(cherry picked from commit 6070bc0)

* Better handling of classloader closing

(cherry picked from commit 2f6413b)

Improves CorDapp build instructions by including other ext versions, and clearly pointing to the templates as a guide.

CORDA-696 - Contract upgrade transactions - handle WhitelistedByZoneAttachmentConstraint for input state constraint verification (#2664)

CORDA-1127 - updated comments to follow current port layout (#2669)

CORDA-1102 / CORDA-1103 - Fix IRS Demo on Windows (#2668)

* CORDA-1102 - Fix IRS demo README

* CORDA-1103 - Fix JAR paths in IRS demo launcher

CORDA-1035 - Testing api KDoc Updates (#2670)

* [CORDA-1035] Testing api KDoc Updates (#2584)

* Testing api KDoc Updates

* Update after code review

* Update api-current

* Revert changes to compiler.xml

* Made comment changes from review

* Fixing merge conflict

* Don't expose net.corda.node through test API (first pass)

* Fixing merge conflicts

* Update api-current

* Addressing review commits

* Fix exposure of internal implementation of MessageHandlerRegistration

* Make InProcess expose ServiceHub instead of internal StartedNodeServices

* Move InternalMockMessaginService interface to internal namespace

* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo

* Don't expose WritableTransactionStorage via testing api

* Create public VerifierType enum

* Update api-current and modify check-api-changes to check for net.corda.node exposures

* Fix merge conflicts

* Fixing another merge conflict

* Fix accidentally broken unit tests

* Make getInternalServices a property

* Fix failing unit tests

* Add todo to check-api-changes

* Fix rpc sender thread busy looping

* Fix tests

* Fixing tests

* Address mike's comments

* Fixing tests

* Make random port allocation internal

* Update api

* Update api

CORDA-1112 - Explicit dependency on JS dep dir seems to eliminate race condition bug (#2675)

* Explicitly add directory with downloaded JS dependencies

* Indentation

Added exclude whitelist to Network Bootstrapper to enable fine grained testing (#2666)

* Added exclude whitelist to Network Bootstrapper to enable fine grained testing.

* code review change

CORDA-991 - Finalise API stabilty (#2685)

CORDA-1048 - Making it simpler to move an existing local deployment of nodes to across different machines (#2697)

* Various cleanup of the network map code (#2604)

(cherry picked from commit 2af0fee)

* CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. (#2672)

This was achieved by having the hash in the node-info file to be just of the node's X.500 name. This also solves existing duplicate node-info file issues that we've been having.

Also updated the docsite.

(cherry picked from commit 8616f24)

Fix the serialisability of TransactionVerificationException and subtypes. (#2695)

Add KDocs for the exceptions in this file, and deprecate exceptions that aren't actually used.

RELEASE: Bump platform version (#2700)

1076 - Filters out structural steps when tracking a flow via RPC.

CORDA-1050 - docs on whitelisting CorDapps (#2671) (#2694)

* CORDA-1050 docs on whitelisting CorDapps

* Addressed code review notes

* Addressed code review notes

(cherry picked from commit 06af213)

CORDA-1131 - Fix webserver startup when headless

CORDA-1134 - Don't use private serializers for all CAPS properties (#2708)

Whilst it does currently work it only does so by going down an incorrect
code path. A property THING that is public and has a getter should
be fetched using that getter, not trip into the private property
accessor.

Fix another non-serializable exception, add docs, fix a possible security issue. (#2707) (#2710)

* Fix another non-serializable exception, add docs, fix a possible security issue.

* Update API definition to reflect methods added to make more exceptions serializable

CORDA-1144 Fix documentation that refers to IRS demo code (#2713)

(cherry picked from commit 1ca3565)

Reflects change to shell example in tutorial-cordapp docs.

CORDA-1123 - Node explorer / Demobench UI issues (#2684)

CORDA-1115 - Cannot serialize private nested objects (#2709)

* CORDA-1115 - Cannot serialize private nested objects

Backport from master

* Fix backport issue

CORDA-1136 - Update startup message of P2P address and port (#2699)

CORDA-1082 - Add doc for --just-generate-node-info (#2719) (#2722)

(cherry picked from commit 067c9fb)

CORDA-1160 - Only read node-info files if their last modified time has changed. (#2717) (#2718)

(cherry picked from commit 4a73a80)

CORDA-1150 - better log messages (#2721)

* CORDA-1150 better log messages

* CORDA-1150 better log messages

* CORDA-1150 better log messages

Corda-1137 - Docker/docker-compose on Windows (#2726)

* Remove IRS Docker demo helpers

(cherry picked from commit 8992b2c)

* Add configuration variables info in README
Switch to corda fork of docker-compose-rule to include default Windows docker location

* Review fixes

CORDA-1147 - fix shell (#2730)

CORDA-1156 - Fixed displayed nodeInfo and stateMachineSnapshot in InteractiveShell. (#2732)

RELEASE: Update version number for RC02 (#2735)

Update identity docs (#2319) (#2677)

* Update identity docs (#2319)

* Update certificate extension specification

* Extend documentation on node name requirements

* Moving node naming back to node generation file. Merging other permissioning information.

* Update certificate structure image

* Address some of the comments

CORDA-1140 - RPC Client's P2P Context should use AMQP (#2741)

CORDA-1030 - allow nodes to be waited for inprocess (#2678)

* allow nodes to be waited for inprocess

* review comments

* Andr3ej suggested fix for test

* fix build and rebase

* add 2 spaces indentation to line 892 of DriverDSLImpl.kt

* add one space to line 799

* remove one space from line 892

* (re)add another space to line 799

CORDA-1145 - troubleshooting updates (#2742)

CORDA-1046 - add docs about the split plugins to corda.net (#2712)

* add docs about the split plugins to corda.net

* Update cordapp-build-systems.rst

CORDA-1173 - api-identity and docs (#2743)

CORDA-1175 - counterparty docs homogenisation (#2747)

ENT-1575 - Shorten table name (#2751)

(cherry picked from commit 4ad0d4f)

Corda-1155 - Jolokia logging via slf4j (#2753)

* Jolokia logging through slf4j

* review remarks

Fix permissioning doc (#2755) (#2756)

(cherry picked from commit 4e5df2f)

CORDA-1186 - Move ConstructorForDeserialization out of internal (#2760)

Backport from master

Removed a reference to an appender not present in tests (#2761)

CORDA-1049 Minor update to Corda API doc to replace notes relevant to 1.0 to 3.0 (#2688)

* Minor update to Corda API doc to replace notes relevant to 1.0 to 3.0

* Update corda-api.rst

Added more security info from James B

* Update corda-api.rst

Grammatical change

* Update corda-api.rst

* Update corda-api.rst

* Update corda-api.rst

* Text updates

d and s fix
Listed only Postgres as a support db

CORDA-1117 - node-explorer.rst port fixes (#2764)

CORDA-1092 - fix secureRandomBytes (#2766)

CORDA-696 - Ensure deterministic transaction id calculation for contra… (#2676)

* CORDA-696: Ensure deterministic transaction id calculation for contract upgrade and notary change transactions.

The problem with the previous implementation is that the transaction would be deserialized with the schema specified
in the serialized form, but the calculation of the id would involve re-serializing properties using a local serialization context
which might produce a different result.

* Support forwards compatibility for new hidden or visible properties

* Some refactoring and updating api docs

* Fix tests & add custom serializer in case the transaction is captured in a checkpoint

* Update id calculation for notary change transactions as well - no filtering is involved

* Use computeNonce

* More refactoring

* Use helper for computing component hashes

* Optimise id calculation

Warning about possible classpath clashes (#2768)

CORDA-1171 - When a double-spend occurs, do not send the consuming transaction id and requesting party back to the client - this might lead to privacy leak. Only the transaction id hash is now returned. (#2746)

CORDA-1192 - Quieten message when reflecting on kotlin builtin (#2769)

CORDA-1197 - Take into account last amount submitted when adding data points. (#2771)

Current logic in `CashWidget` is not handling well updates done in close succession, i.e. less than 1 second.
And such frequent updates do indeed happen, e.g. from: `net.corda.client.jfx.model.ContractStateModel#cashStates`
where `list` is modified twice.

Also use `.toDecimal()` instead of `.quantity`to have amount represented in pounds rather than in pennies.

CORDA-966 - RELEASE - V3 Release notes (#2492)

* wip

* CORDA-966 - RELEASE - Release notes first attempt

* spek check

* Upated network map section

* Test API documentation.

* TransactionSignature changelog

* v3 release notes: Apache Shiro integration

* Update release-notes.rst

* wip

* wip

* wip

* Update release-notes.rst

Capturing an external contributor I missed

* Update release-notes.rst

* Update release-notes.rst

* Add links to contributors commits

* more changes

* wip

* wip

* wip

* Addresing some of Jose's comments

* Add warning about not being wire sable for RPC

* Addresing some of Jose's comments

* more changes, move the test notes mostly into the upgrade doc

* short note on howto upgrade gradle

* spelling error

* Add a link to upgrade docs on release notes

* review comments

* Update release-notes.rst

* Fix release-notes around contract verification.

* minor changes

* review comments

* add cordapp template example link

* PrivacySalt security and speed release notes.

* It's -> Its

* CORDA-1171: Add notes on the notary error change

* Update release-notes.rst

Its -> It's

CORDA-966 - RELEASE - Update version number for RC03 (#2774)

CORDA-966 - RELEASE - Upgrade notes for V3.0 (#2550)

* DOC: AMQP upgrade notes in brief

* moving test upgrade notes from release notes to upgrade note

* add cordapp/cordformation notes

* Added section for network map changes

* Updated upgrade notes to reflect changes for SSL (#2569)

* Updated upgrade notes to reflect changes for SSL

* Removed some blank lines.

* AMQP Constructor / property mismatch upgrade note

* wip

* Note about feasible (but not recommended) tables that can be migrated from Corda 2.0 to 3.0, basic recipe how to do it.

* Database schema changes - optional partial vault migration described at the end of the paragraph, focus on the overall changes to tables.

* Review Comments

* Database schema changes - split Vault and finance module changes, reformatting, improve migration note.

* Database schema changes - addressing PR comments.

* Database schema changes - move changes to change log, migration to JIRA ticket.

* Finalise versions

* review comments

* CORDA-1171: Add notes on the notary error change

* set release version

CORDA-1186 - ACtually move annotaiton into core module, not just core namespace (#2781)

CORDA-966 - RELEASE - Update version number to corda-3.0

CORDA-966 - RELEASE - Update conf.py for V3

CORDA-966 - RELEASE - Update static versions for V3

CORDA-966 - RELEASE - Final release note tweeks

RELEASE: Fix version number for the docs site (#2797)

RELEASE: Fix version number for the docs site

RELEASE: Post cut vno update (#2808)

Update final API for V3 (#2796)

CORDA-1178 - Api scanner backport and update of api-current.txt (#2813)

* Api scanner backport and update of api-current.txt

* Updated api-current based on current state of release branch

* Update to most recent version of api scanner

* Fix a couple of issues with the merge and regenerate the api file with the most recent version of the scanner.

* Update changelog/release notes

Direct bootstrapper link instead of manual build.

ENT-1665 - Update fast-classpath-scanner version to 2.12.3 (was 2.0.21) (#2880)

Problem manifests now that the classpath scanner is used by the
serialisation framework in factory initialization to locate pluggable
serializers. The actual thrown error is

    java.lang.RuntimeException: Unknown constant pool tag

Given this is a known issue and a fixed bug it makes sense to move the
version forward. Unfortunately at this time we cannot move beyond
2.12.3 as 2.12.4 and later versions (up to the latest 2.18.1) exhibit
some other error that needs investigating. Thus, move to the latest
version that is stable for our current set of use cases.

More information on the nature of the problem exhibited by moving beyond
2.12.3 can be found on the linked Jira (ENT-1665) as well as details on
reproducing the issue moving forward to 2.12.3 fixes.

ENT-1564 - add additional uploader check to the HashConstraint (#2845) (#2881)

* ENT-1564 - add additional uploader check to the HashConstraint (#2845)

(cherry picked from commit 1a1cd94)

* ENT-1564 changelog entry

* ENT-1564 ignored tests that were removed in master

DOCS: Serialization roundtrip removes mutability explanation (#2883)

* DOCS: Serialization roundtrip removes mutability explanation

* review comments

* review comments

* Review comments

* Review comments

* Review comments

ENT-1686 - Improve error message on parameters mismatch (#2891) (#2896)

Improve error message on parameters mismatch

Generate a PDF version of the docsite. Request from a user in Slack. (#2900)

CORDA-1267 - Make JPA entities non-final and Serializable. (#2899)

ENT-1668 - Don't crash on node startup when network map is not available (#2897)

* ENT-1668: Don't crash on node startup when network map is not available (#2887)

Fix ENT-1668

Don't crash on node startup when network map is not available

* Add changelog entry

Improve the upgrade-test-packages.sh script to work on macOS. Fixes an issue found by tom on pubslack. (#2894) (#2901)

[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2902)

CORDA-1276: Cleaned up creation of node-info object on node start and when using --just-generate-node-info (#2912)

(cherry picked from commit 65ff214)

CORDA-1295: Clean up client->observable association on observable finish (#2915)

RELEASE: update vno for release testing (#2933)

* RELEASE: update vno for release testing

* [CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929)

* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments

* [CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929)

* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments
 (reverted from commit 4d39be10a57ff4afb1a6378f2ba5c3c518319d56)

CORDA-1292 - Add CordaService testing documentation and improve tests in irs-demo (#2929) (#2938)

* Add CordaService testing documentation and improve tests in irs-demo

* Addressed review comments

RELEASE: swap version number around

Was corda-3.1 now it's 3.1-corda

should work better with external tools

CORDA-1181 - Add back information on initial registration (#2945)

(cherry picked from commit 2792716)

REVERT - CORDA-1264 - Needs more thought prior to release (#2952)

* REVERT - CORDA-1264 - Needs more thought prior to release

This reverts commit 33af80ac558aab14a9abb0d785da922d116f3f3c.

Since this causes regressions in the way errors are propogated to
clients it seems best to not break or hold up 3.1 but revert this commit
and move on

* fix revert

RELEASE - Update vno for RC02 testing

Pre release v3.1 releasenote (#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

REVIEW: Final release vno

RELEASE - update docs for 3.1

RELEASE - Post V3.1 update vno to 3.2-corda-snapshot

CORDA-1304 - Remove superfluous registerInitiatedFlow calls from tutorial and example tests (#2944) (#3035)

Update jolokia to 1.5.0 (#2617) (#3034)

* Update jolokia to 1.5.0

* adding jolokia update to changelog

CORDA-1389 - Delete the root nodes directory before initialising the nodes. (#3044)

This is to enable multiple calls to deployNodes without doing a gradle clean.

Removed CordappConfig from the V3 release notes as it's not part of this release. (#2966)

CORDA-1229 - Fix issue with setter-based serialisation (#3051)

DOCS - Fixed invalid page ref in upgrade-notes.rst (#3053) (#3055)

(cherry picked from commit 514287e)

CORDA-1403 - Generics serialization issue (#3030) (#3095)

When implementing a generic interface subtype check fails, need
to compare to the actual raw type

CORDA-1385 - Ignore duplicate packages and sub-packages in driver extraCordappPackagesToScan (#3068)

Otherwise duplicate test CorDapps are loaded into the node

(cherry picked from commit 9ffb43f)

CORDA-1346 - split the simm valuation demo to reduce the size of the contract jar - backport (#3099)

* CORDA-1346 split the simm valuation demo to reduce the size of the contract jar (#3078)

* CORDA-1346 fix backport

CORDA-1414 - node should continue with parameters from file when network map not available (#3061) (#3098)

Fix CORDA-1414

If network map is not available or returns exception on network
parameters reading, node should continue with parameters from file.

Resolves conflicts. (#3089)

CORDA-1344 Fix query paging in scheduled flow tests (#2970) (#3096)

* Fix paging tests, move out of scheduled flow tests and provide java example

* Fix a few issues with docs

CORDA-1280 - Update the api-scanner to the most recent version + regenerate api (#3154)

* Update v3 api scanner to most recent version

* Regenerate api-current.txt

* Fix bootstrapper classpath

Reordering fix: move now works as depends on creation of html directory from previous step. (#3106)

CORDA-1317 - Add cert role to CSR and doorman issue cert according to the cert role (#2620)

Cherrypick from master

* ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431)

* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.

(cherry picked from commit 94f7392)

* remove R3 corda code

merge failure fix

[CORDA-1397]: Fixed incorrect exception handling in `NodeVaultService._query()`. (#3043)

CORDA-1386 - Updates withoutIssuer to not strip display token size. (#3191)

CORDA-1315 - small doc correction (#3079) (#3192)

* CORDA-1315 small doc correction

* CORDA-1315 address code review changes

CORDA-1342 - The shell doesn't print the return value of a started flow - fixed. (#3007) (#3197)

CORDA-1455 - Error in process-id deletion process allows multiple instances of same node to be run (fix). (#3118) (#3195)

CORDA-1405 - Integration test for network parameter updates and improved logging (#2865)

(cherry picked from commit 620ba1e)

Also updated the toString() of NetworkParameters and NetworkMap to be better formatted.

Corda-1338 | Corda-1394 (#3205)

* [CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix).

* [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState (fix).

* [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState (fix).

* Attempting to fix weird recursive types problem.

* Attempting to fix weird recursive types problem.

* Attempting to fix weird recursive types problem.

CORDA-1530 - Generics break default evolver (#3232)

* CORDA-1530 - Generics break default  evolver

When selecting an annotated constructor for evolving a type make sure
we treat generics in the same manner we did when serialized. Effectively
throw away the template information and treat lists as lists and maps
as maps

CORDA-1545 - Arrays of primitive byte arrays don't deserialize (#3249)

At serialization time we incorrectly encode the type as byte[p][] instead
of binary[]

RELEASE - Update api to match new annotation generation

Reflects master changes to set up and contrib instructions. (#3264)

CORDA-866, ENT-1933 - Remove stale nodes from Network, Fix NetParam serialization (#3255) (#3128)

*  CORDA-866: Implement removal of stale nodes from network - backport (#3128)

* CORDA-866: Implement removal of stale nodes from network

Backported

* Implement removal of stale nodes from network

Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.

* Add copy method to NetworkParameters data class

Add JvmOverloads annotation to the constructor, because it's data class
exposed in API

* Fix test

* ENT-1933: make NetworkParameters serialization compatible (#3234)

* ENT-1933: make NetworkParameters serialization compatible

* Fixes after cherry-pick

Update getting-set-up.rst

CORDA-1297 - Columns nullability (#3112) -> V3 (#3303)

* [CORDA-1297] Columns nullability (#3112)

JPA/Hibernate entities need to impose the correct NULL/NOT NULL constraints on the database - whatever these correct values actually are.
API change: net.corda.core.schemas.PersistentStateRef fields (index and txId) are now non-nullable. Rationale: The fields were always effectively non-nullable - values were set from non-nullable fields of other objects. The class is used in context of database table Primary Key of for other entities and a database already imposes those columns as non-nullable (even if JPA annotation nullable=false was absent).

(cherry picked from commit 7d69bc6)

* Compilation fix

CORDA-1356 - OOM when using Demobench + Explorer (fix). (#3268) (#3300)

CORDA-1266 - When a cash output is identical only the fist output is saved. (#3244) (#3311)

(cherry picked from commit 0a4d981)

CORDA-1499 - Fix a typo in node_attchments_contracts table name. (#3310)

(cherry picked from commit fc54263)

CORDA-1575, CORDA-1341 - Fix logfiles for out of process nodes,  Ensure API can be called concurrently wrt transactions.(#3312)

* [CORDA-1575]: Out of process nodes started by the driver do not log to file (fix).

* [CORDA-1341]: Ensure API can be called concurrently wrt transactions.

* [CORDA-1575]: Fixed unstable test.

CORDA-1459 - Buggy CommodityContract issuance logic (#3338)

CORDA-1498 - serialization multiple transform bug (#3391)

* CORDA-1498: serialization multiple transform bug (#3216)

* Fix issue when evolving enums with transformation chains

* Regenerate test data for deserializeWithRename test and unignore

* Further tweaks / remove debugging

* Formatting tweaks

* Address review comments

* Remove debug

* Add classname to serialization tranform exceptions

* Use direct node links instead of indexes to improve readability

* More readability tweaks

* More readability improvements

* rename require to requireThat to resolve conflict with kotlin libraries

* Add logging of error message

* Change requireThat helper to inline function

* remove unneeded toString

* Further tweaks

* Change NotSerializableException to more generic IOException

* Make exception context clearer

* Fix merge conflicts

* Fix broken test

* Revert changes to serialized classes

CORDA-1661 - Reverting DEV certificates keys (#3466)

CORDA-1510 - Allow Doorman and NetworkMap to be configured independently (#3494)

* CORDA-1510 - Allow Doorman and NetworkMap to be configured independently  (#3485)

Currently only one compatabilityZoneURL can be specified, however the
two services can be run on as separate servers. Allow nodes to be
configured in this manner

* Fix cherry-pick

CORDA-1711 - Remove dependency on PathUtilsKt in net.corda.core.internal (#3495)

CORDA-1709 - The MVP blob inspector, able to inspect network service blobs (#3503)

* 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.

(cherry picked from commit 3bb95c3)

* CORDA-1238: Updated JacksonSupport to support SerializedBytes, CertPath, X509Certificate and the signature classes (#3145)

SerializedBytes are first converted to the object it represents before being serialised as a pojo.

These changes will be needed to support the the blob inspector when it will output to YAML/JSON.

(cherry picked from commit b031e66)

* Cherry picked part of commit 824adca to port over *only* the JackSupport refactoring.

* CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.

(cherry picked from commit 4e0378d)

* Added back support for parsing OpaqueBytes as UTF-8 strings in JacksonSupport (#3240)

(cherry picked from commit d772bc8)

* Cleaned up blob inspector doc (#3284)

(cherry picked from commit b7fbebb)

* Blobinspector: trace level logging with --verbose (#3313)

(cherry picked from commit 6a2e50b)

* Cherry picked part of commit 3046843 to fix issue with --version

* Fixes to the api file

remove CRL url from dev doorman cert (#3555) (#3560)

CORDA-1744 - update jolokia to latest version (#3564)

CORDA-1727 - Document more clearly the supported version of IntelliJ and the IntelliJ Kotlin Plugins. (#3550) (#3588)

Serialization documentation backport (#3594)

CORDA-1717 - backport bootstrapper to 3.2 (#3496) (#3602)

CORDA-1628 - Increase max restart count for notary client flows. (#3357) (#3603)

This will ensure that the notary client flow will retry over a sufficient
period of time for the notary to update its network map.

With a backoff base of 1.8 and 5 retries the last retry will fire after
about 20 min 8 sec of the initial flow start:

0	30
1	54
2	97.2
3	174.96
4	314.928
5	566.8704

Total 1207.9584	= 20.13264 min

CORDA-1588 - Add an extra check in the attachment resolution flow to prevent duplicate attachment import if multiple transactions with the same attachment are being resolved at the same time. (#3599)

CORDA-1634 - Destroy child processes when parent exits. (#3368) (#3604)

* [CORDA-1634] Destroy child processes when parent exits.

* Add comment.

* Register Shutdownhook for processes regardless of whether the Driver was initialized with

* Add comment.

* Revert "Add comment."

This reverts commit a5e78c379fba4e132cb3287997e77e21a6600947.

* Add comment.

* Add shutdown hook in ShutdownManager.registerProcessShutdown.

* Initialize the ShutdownManager with a shutdown hook to ensure that  is called.

* Add comment.

CORDA-1662 - Corda Serialization Evolution breaksdown with Java classes (#3427)

Nullability logic was relying on annotations that Kotlin applies by
default but is left to the developer in Javaland. Change this around
so it works for both.

In Kotlin, the property must be nullable, in Java, it can't be a
primitive.

CORDA-1662 - Post backport fixes

CORDA-1808 - Refactor serialization test infrastructure backport

CORDA-1499, CORDA-1804  (#3607)

* Fix a typo in node_attchments_contracts table name. (#3202)

(cherry picked from commit 57d379597bcff397edd3b71ffb8ac9901be06b22)

* CORDA-1804 Corda node stops when detecting not migrated node_attachments_contracts table name (#3593)

Database table NODE_ATTACHMENTS_CONTRACT_CLASS_NAME in v3.0 was changed to NODE_ATTCHMENTS_CONTRACTS in v3.1 and then finally NODE_ATTACHMENTS_CONTRACTS on current master. Users may omit the upgrade note and run into errors. After the change the node will not start if the new table name is not found and any other older ones is found.

(cherry picked from commit 208ac49da0caaf0dfc5ade9f8bd8a49d13f17aae)

* Fixes after cherry-pick of 208ac49da0caaf0dfc5ade9f8bd8a49d13f17aae.

Backport CORDA-1499 CORDA-1804 - remove unused code.

CORDA-1686 - Make "rpc-client-sender" daemon (#3455) (#3611)

Such that they do not prevent application that started them from exiting.

(cherry picked from commit 3492350)

CORDA-1790 - Roll back flow transaction on exception (#3597) (#3616)

* CORDA-1790 Roll back flow transaction on exception

* CORDA-1790 Roll back flow transaction on exception

* CORDA-1790 Roll back flow transaction on exception

CORDA-1789 - Split Doorman / NM config - fix for CORDA-1510 (#3605)

RELEASE - Fixed build.gradle issues that break maven central publishing and standardised dependency specification.

Improves docs on running Example CorDapp. Debugging info. (#3670)

* Updates instructions for running example CorDapp.

* Readds debugging information.

RELEASE - Bump potential build number

Given we released 3.2-corda from the release-V3.X branch bump
the version number here for the next release.

RELEASE - Align main V3 release branch with 3.2 release

Should 3.3 occur then this won't break the upgrade or release note
flow

CORDA-1585 - Tidy up participate docs (#3682)

* CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)

* Fix TOC for HTML and PDF (Backport from Enterprise docs)

* Tidy up participate section

* Address review comments

* Fixing merge issue

* Add release process changes into index

Reflects network builder docs.

Backports network bootstrapper docs. (#3718)

CORDA-1847 - Backport hibernate observer fix (#3726)

* CORDA-1847 Backport hibernate observer fix

* CORDA-1847 Fix tests

CONTRIBUTION - Added favicon to docs.corda.net (#3199)

* Added favicon to docs.corda.net

* docs.corda.net favicon path fix

CONTRIBUTION - Network bootstrapper check for duplicate node names (#3182)

CONTRIBUTION - Update tut-two-party-flow.rst (#3133)

Bug: https://github.com/corda/corda/issues/3120
Updated line 55: From: IOUContract.Commands.Create -> IOUContract.Create

DOCS - update azure documentation (#2950)

add yo!app deployment for Corda V2

DOCS - flowTracker to progressTracker (#3316)

Resolve #3291

DOCS - Update Shell.rst with CashIssueFlow (#3546)

* Updated for issue: 3120

https://github.com/corda/corda/issues/3120- for details

* Updated shell.rst

Correct Shell Flow usaged for CashIssueFlow

* Updated Shell.rst as per latest CashIssueFlow

CONTRIBUTION - IdentitySyncFlow - loadStates of an input only if it is in local storage (#3701)

CONTRIBUTION - Optimize imports (#2872)

CONTRIBUTION - Configure NetworkMapUpdater executor so that it doesn't block node shutdown (#3530)

DOCS - A typo fix.

Line 108
Was: We want to create an IOU of 100 with PartyB. We start the ``IOUFlow`` by typing:
Should be We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing:

CORDA-1201 - Remove duplicated doc section. (#2924)

DOCS - Miner change to mention notary node dosen't need web server, and also change the total terminal windows number from 8 to 5 (#3012)

* There is a duplication of the kotlin introduce part, which is the same as the description of the "Note" section right below. So remove this duplicated part but keep the "Note".

* A miner change about the build node folder structure, first is Notary node doesn't need one web server, second is in V3.0, there are 5 windows totally but not 8.

* Miner updates for the format of changes, as instructed by Joel on https://github.com/corda/corda/pull/3012

CORDA-1837 - Reject nodes that have the same organisation name in driver tests (#3740)

* Reject nodes that have the same organisation name as a previously registered node rather than the same X500 name

DriverDSLImpl -> NetworkVisibilityController -> register check organisation name rather than X500 name and throw IllegalStateException if already exists
Added test to DriverTests to test multiple organisation names end exceptionally

* Remove redundant test and store the organisation names rather than X500 names for driver tests

RELEASE - Backport fixes
 * Rolls back dirty change.
 * Rolls back unneeded import.

Update index.rst

Removes old Corda Zone reference (#3781)

[CORDA-1681]: It is not possible to run stateMachinesSnapshot from the shell (fixed). (#3792)

Fix loadStates for large page sizes and added unit test. (#3788)

CORDA-1905: Extend JSON deserialisation to handle Amount<T> for any T (#3819)

* CORDA-1905: Extend JSON deserialisation to handle Amount<T> for any T. (#3790)

* Extend JSON deserialisation to handle Amount<T> for any T.
* Rewrite message for @Deprecated.

Conflicts:
	client/jackson/src/main/kotlin/net/corda/client/jackson/internal/CordaModule.kt

* CORDA-1905: Configure Spring Boot to use same version of Jackson as Corda.

CORDA-1906: Add Servlet 3.1 implementation into the WebServer. (#3794) (#3820)

CORDA-1907: Allow Corda's shell to deserialise using generic type information. (#3810) (#3827)

CORDA-1812 - fix Postgres db bloat issue (#3614) (#3857)

CORDA-1841 - Made paths in tutorial-cordapp consistent. (#3778) (#3867)

CORDA-1888 - Fix Vault Query composite queries  (#3775) (#3869)

* CORDA-1888 Fix Vault Query composite queries  (#3775)

* Reproduce composite query failures.

* Fixes to OR querying and composite queries that use the same QueryCriteria (Linear, Fungible, Custom) more than once.

* Revert debug logging for Hibernate SQL.

* Cleanup and remove redundant joinPredicates global var.

* Fix failing Java Unit test.

* Fix Java compilation error in example-code section of docs.

* Include copy() function for original constructor to maintain backwards API compatibility.

* Fixed compilation errors post cherry-pick.

DEVOPS-764 - Jolokia dependency is incorrectly specified and removed in master (#3380)

* DEVOPS-764 - Jolokia dependency is incorrectly specified and removed in master.

* Backported more changes.

Backports: CORDA-1663, CORDA-1638, CORDA-1542 (#3881)

CORDA-1837: Reject nodes that have the same organisation name in driver tests

* Reject nodes that have the same organisation name as a previously registered node rather than the same X500 name

(cherry picked from commit 40b922c1f2e620a5665f6f2385cdafd5e70bd780)

ENT-2054: Logging improvements (#3397)

CORDA-1938 Adding version info to the node info submission request (#3854) (#3885)

CORDA-1604 Node Info file watcher should block and load node info when node startup (#959) (#3333) (#3879)

(cherry picked from commit 2fce979)

(cherry picked from commit 072b4207e0877acc814d89805a6c17b1a22df56d)

CORDA-1934 Renaming INTERMEDIATE_CA certificate role to DOORMAN_CA certificate role (#3878)

CORDA-1932 Fixing network map certificate path validation (#3877)

CORDA-1803 - Fix variable replacement (#3585) (#3866)

Fix duplicate index declaration. (#3779) (#3875)

Updated repository lists to reduce dependency on Jitpack and removed … (#3891)

* Updated repository lists to reduce dependency on Jitpack and removed unused repositories.

* Adding artifactory_contextUrl parameter

CORDA-1875 - backport tweaks made to RPC client for handling loss of node (#3916)

* CORDA-1875: backport tweaks made to RPC client for handling loss of connection to the node

* CORDA-1875: backport missing code

CORDA-1858 - Vault query fails to find a state if it extends from cla… (#3868)

* CORDA-1858 - Vault query fails to find a state if it extends from class (#3722)

* Included Contract State parent classes in list of queryable types.

* Added changelog entry.

* Fixed compilation errors post cherry-pick.

* Fixed failing unit tests following cherry-pick.

CORDA-1093 - Deleting node info from directory (#3115) (#3921)

* CORDA-1093 Deleting node info from directory

Deleting NodeInfo from additional-node-infos directory should remove it from cache.

CORDA-1976 - Fix flaky test (#3935)

CORDA-1892 - CRaSH shell flow start fix for similar flow names. (#3874) (#3928)

* CORDA-1892 CRaSH shell flow start fix for similar flow names. (#3874)

* Added fix and associated unit test.

* Fixed broken unit test + added another test case + used NoOpFlows + use Mock output object to assert correct result output.

* Remove unnecessary additional println.

* Minor cleanup in test code.

* Relax nameFragment matching to cater for fully qualified and simple Flow classname specifications.

* Remove superfluous check.

* Minor fix + added additional Unit Test cases to cover all scenarios.

* Reverted back to original behaviour + extra check to avoid ambiguity for exact match.

* Changes following final PR review comments.

* Revert to non visible latch as no associated integration tests defined in this release.

CORDA-1572 - Create marker file to track initial registration status. (#3621) (#3883)

[CORDA-1572] Create marker file to track initial registration status.

CORDA-1548 - Hibernate session not flushed before handing over raw JDBC session to user code (e.g. coin selection) (#3266) (#3865)

* Hibernate session flushed before handing over raw JDBC session to user code + test - inserting and selecting cash in the same transaction
* Additional two tests copied from Enterprise repo

CORDA-1949, CORDA-1950 - Miscellaneous doc fixes (#3760) (#3919)

* ENT-2298: CE Hello World Tutorial Page references Corda V1.0

Removed version number completely from text, I thought this made more sense than hardcoding a version which will almost immediately be out of date.

* ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text

Updated text to proper method

* ENT-2305: Java Instructions to Invoke Hello World CordApp fail

Removed Java instructions

RELEASE - Release script to extract which issues are in a release (#3945)

* RELEASE - Release script to extract which issues are in a release

In addition, format the output for inclusion in the release notes. Not 100% sure
if this should be in the tree or out in a separate repo but we have
*a lot* of small repo#s now and this is fine to live here unless
anyone vehemently disagrees

Add additional modes, make keyring optional

CORDA-1811 - If a second identity is mistakenly created the node will not start

Corda-1945 - class-carpenter bugfix (#3969)

CORDA-1995 - Removing DigitalSignatureWithCertPath (Cherry Pick) (#3970)

* CORDA-1995 Adding the parent certificate chain to the DigitalSignatureWithCert class

* Addressing review comments

RELEASE - ignore flakey test, it seems to OOM randomly

CORDA-2001 - SNI header for future inter-op (#3977)

RELEASE: Ready to cut 3.3 RC01

CORDA-1563, CORDA-2029 - backports to 3.3 (#3990)

* CORDA-1563 : Don't remove own node info - fix (#3219)

* CORDA-2029: Don't remove own node info

Don't remove own node info from cache on network map update.

* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries (#1101)

* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries
ENT-1880 Move identity key generation to network registration process

(cherry picked from commit c3ac203)

NOTE: Moved ENT Jira's to OS project

[CORDA-1948]: Demobench profile load fails with stack dump -- for Corda OS 3.3 -- branch release-V3 (fix) (#3992)

CORDA-2012 - copying all from the network trust store (#3991)

CORDA-2037 - Add network bootstrapper and other tools to published binary list (#4003)

* Publish tools to Artifactory: Blob Inspector, Network Bootstrapper (#3321)

* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.

* Fix bootstrapper publication problem. (#3370)

* Fixed double JAR publishing problem with network bootstrapper. (#3354)

Fixed merge issue

CORDA-2016 - Add unit tests to ensure SNI header generation will not be changed by accident (#4018)

* CORDA-2016 Add unit tests to ensure SNI header generation will not be changed by accident (#4014)

* Add test for SNI header to prevent changing it accidentally.

* added hardcoded values test to ensure hashing function and corda x500 name format can't be changed

(cherry picked from commit 149b6034e1b1bf5c71abd2f4910c0e14c6276efe)

* fix test after cherrypick

CORDA-2019 - Bootstrapper docs should not include --dir switch (fixed). (#4023)

CORDA-2066 - `setting-up-a-corda-network` docs file is misleading (fixed). (#4024)

CORDA-1297 - revert column nullability (#4030)

* CORDA-1297 revert column nullability

* CORDA-1297 address code review comments

* CORDA-1297 address code review comments

RELEASE - 3.3 Release Notes (#3948)

* RELEASE - Initial release notes addition

* RELEASE - Contributors and issues fixed

* RELEASE: release notes

* release comments

* remove some random temp file

* wip

* wip

* commenting on 4.0

* Review comments

* Review comments

* Remove 4.0 ref, remove ref to item we're backing out

* Capitalise CZ

CORDA-2071 - Log file filling with Artemis messages and rolling over quickly (#4034)

* ENT-1850: Improve reporting of connection problems (#3124)

* Add nicer logging for SSL handshake problems

* Just in case let people see the horrid netty exception traces at trace level

(cherry picked from commit 3c005789c02c07b8a02ad714b9d15e8024faf5ea)

* fixup after cherrypick

* Prevent bridge reconnection attempts on targets that present invalid/misconfigured/different certificates to protect nodes from dead identities. (#3225)

(cherry picked from commit 7ff008d4e390a938da94c0862c5eed4d6625871b)

* fixup after cherrypick

* add extra error handling (copied from master)

RELEASE - Bump vno for second release candidate

CORDA-2097 - Add missing Node Explorer artefact publication (#4066)

RELEASE - Post release candidate cleanup

Simple change to the message returned when the requested legal identity does not exist on the Node. Previously it returned `Node does not have an identity`, which is slightly confusing as the Node does have a legal identity, just not the one that was requested. Changing the message text to `Node does not have the requested identity of` makes it clearer that the client requested an identity different to any of the ones that this Node represents.

Added a function to allow the client to check if the Node contains a specific CordaX500Name amongst its legal identities. Unlike the `identityFromX500Name` function, an exception is not thrown if the Node does not represent the requested legal identity.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants