szymonsztuka
76c1b08b27
Merge remote-tracking branch 'remotes/open/master' attempt 2
2018-04-05 11:18:01 +01:00
szymonsztuka
ad5ceedbd9
Merge remote-tracking branch 'remotes/open/master'
...
# Conflicts:
# docs/source/changelog.rst
2018-04-04 18:01:35 +01:00
szymonsztuka
22391c21c5
Change log and upgrade notes for Shell changes in CORDA-792. ( #2919 )
2018-04-04 15:59:05 +01:00
Shams Asari
6283462548
Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-04-04 14:18:24 +01:00
Joel Dudley
7deb802547
Adds link from changelog to upgrade notes.
2018-04-03 18:03:07 +01:00
sollecitom
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
Michele Sollecito
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. ( #2892 )
2018-03-29 13:01:41 +01:00
ags
ed9a31522b
Merge remote-tracking branch 'open/master' into ags_2018-03-29
2018-03-29 09:22:10 +01:00
szymonsztuka
c28a16cb41
Description id docs and change log.
2018-03-28 17:09:42 +01:00
Katelyn Baker
1f2d9454ee
Merge remote-tracking branch 'open/master' into kat-merge-27-03-18
2018-03-27 10:22:42 +01:00
Katelyn Baker
e43b12c203
CORDA-1236 - Don't let Carpenter exceptions escape the serializer ( #2852 )
...
* CORDA-1236 - Don't let Carpenter exceptions escape the serializer
* Review comments
* Merge branch 'kat/bug/master/nestedCArpenterException' of https://github.com/corda/corda into kat/bug/master/nestedCArpenterException
2018-03-27 10:11:39 +01:00
Katelyn Baker
0f99efa768
CORDA-1213 - Explicitly disallow serialization of non static nested classes ( #2824 )
...
* CORDA-1213 - Explicitly disallow serialization of non static nested classes
WIP
* Review comments
2018-03-27 10:06:46 +01:00
Katelyn Baker
91cdcc6752
CORDA-1258 - Only register custom serializers once ( #2862 )
...
* CORDA-1258 - Only register custom serializers once
* Review comments
* Fix test
2018-03-26 19:09:03 +01:00
Anthony Keenan
7dbceaadcb
Merge remote-tracking branch 'open/master'
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-03-26 15:46:26 +01:00
Katelyn Baker
c3031b182b
ENT-1665 - Update fast-classpath-scanner version to 2.12.3 (was 2.0.21) ( #2877 )
...
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.
2018-03-26 14:24:43 +01:00
bpaunescu
79c7fd7c82
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
added missing changelog line
2018-03-20 17:13:30 +00:00
bpaunescu
aaa9e8c83f
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
2018-03-20 16:54:56 +00:00
Michal Kit
144632818c
Adding the X509CRL custom serializer. ( #2844 )
...
CORDA-1233
* Adding the X509CRL custom serializer.
* Addressing review comments
2018-03-20 15:42:25 +00:00
sollecitom
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
Michele Sollecito
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell ( #2831 )
2018-03-19 14:20:10 +00:00
Andrius Dagys
0d1e9694ae
Merge remote-tracking branch 'open/master' into andrius-merge-1503
2018-03-15 15:07:55 +00:00
Michal Kit
15e4449b38
Adding BigInteger serialization support ( #2804 )
...
* Adding BigInteger serialization support
* Addressing review comments
2018-03-15 10:11:01 +00:00
Katelyn Baker
df536cee86
CORDA-966 - RELEASE - Merge release notes from release branch to master ( #2775 )
2018-03-14 10:05:38 +00:00
sollecitom
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
Michele Sollecito
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. ( #2484 )
2018-03-01 14:57:36 +00:00
Ross Nicoll
754b87d547
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
2018-02-28 18:04:08 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
Andras Slemmer
38d0ad30df
Merge commit 'da591363fdccd220455a92f083d2ad59ed0e2d12' into aslemmer-merge-19-Feb
2018-02-20 13:52:03 +00:00
Andras Slemmer
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00
Andras Slemmer
1d7b0fc499
Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb
2018-02-19 16:14:43 +00:00
Shams Asari
71c94f8a9d
Reversing the introduction of GlobalProperties (by CORDA-961), and added NetworkParameters to ServicesForResolution instead. ( #2563 )
...
Also, replaced the maxTransactionSize parameter of the driver and MockNetwork with NetworkParameters.
2018-02-19 12:23:59 +00:00
Anthony Keenan
c2485858f5
CORDA-1011 Add powershell script to update testing package imports ( #2528 )
...
* Add powershell script to update testing package imports
* Make sure script works with java files
* Address review comments
2018-02-16 10:22:41 +00:00
Shams Asari
2864ce1384
ENT-1519: Ensure NodeInfo always has at least one address by checking in the c'tor ( #2538 )
...
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.
2018-02-15 14:06:41 +00:00
Clinton
eeb96535ee
Re-added missing changelog entries
2018-02-14 17:04:08 +00:00
Clinton
174ed3c64b
CORDA-556: Added Cordapp Config and a sample ( #2469 )
...
* Added per-cordapp configuration
* Added new API for Cordformation cordapp declarations to support per-cordapp configuration
* Added a cordapp configuration sample
2018-02-14 14:49:59 +00:00
Michele Sollecito
da591363fd
CORDA-990: Flows Draining Mode ( #2483 )
...
[CORDA-990]: Flows draining mode.
2018-02-12 16:13:43 +00:00
Anthony Keenan
1487c411b4
CORDA-716 - Update changelog for test package changes and provide upgrade script ( #2434 )
...
* Update changelog for test package changes and provide upgrade script
* Upgrade kotlin and java scripts
2018-02-12 15:53:29 +00:00
Joel Dudley
3f3e0e9973
Allows the webserver JAR used by each node in deployNodes to be configured.
2018-02-12 14:00:25 +00:00
Anthony Keenan
7b65b7971a
CORDA-939 - Don't expose StartedNode and AbstractNode as part of public test api ( #2472 )
...
* 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
2018-02-12 10:09:59 +00:00
Katelyn Baker
3c4212a3d6
CORDA-992 - Make the finger printer pluggable for serialization factory ( #2479 )
...
Facilitates easier testing
2018-02-12 10:07:25 +00:00
Patrick Kuo
c8cf46c657
CORDA-961 Wire up and enforce max transaction size ( #2465 )
...
* 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
2018-02-09 14:48:45 +00:00
Anthony Keenan
4a68145f23
CORDA-939 Adding documentation changes requested from v3 release branch PR ( #2480 )
...
* Adding documentation changes requested from v3 release branch PR
* Further doc changes as requested
2018-02-08 14:38:15 +00:00
Patrick Kuo
941429d3a7
Remove word restriction in corda x500 name ( #2439 )
...
* Remove word restriction in x500 name https://github.com/corda/corda/issues/2326
* remove unused const
* address PR issue
* address PR issue
* address PR issue
2018-01-31 17:05:52 +00:00
szymonsztuka
1ecf646f7e
Oracle 11xe and 12c database compatibility ( #206 )
...
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change)
* Removed unnecessary code from ConfigUtilities (non Oracle specific change)
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
Matthew Nesbit
054c44d4bc
Merge from OS to ENT including Bridge manager work
2018-01-26 16:55:43 +00:00
Matthew Nesbit
0ff9c9e2e3
Move to message based bridge control protocol ( #2410 )
...
Tidy up
Remove dead RPCSecurity logic from ArtemisMessageServer
Address PR comments
Address PR comments
2018-01-25 17:53:34 +00:00
Shams Asari
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
igor nitto
1be4f0950d
Remove compile time dependency on JDBC drivers [ENT-1363] ( #387 )
...
* Change JDBC drivers dependencies to integrationTestRuntimeOnly
* Added smoke test validating JDBC driver registration located in "./plugins" directory
* Some docsite tweaks
2018-01-25 13:38:51 +00:00
Ben Wyeth
d17670c747
Provide an API to register callback on app shutdown ( #2402 )
...
Provide an API to register callback on app shutdown.
2018-01-24 16:19:24 +01:00
Michele Sollecito
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
