ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-20 02:55:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,589 Commits 99 Branches 407 Tags
Commit Graph

13589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shams Asari
8442b13e5e Un-ignoring .idea/codeStyles/ to make merge possible 2018-11-09 14:48:08 +00:00
Michele Sollecito
72be3aa830
Merge pull request #1553 from corda/merges/08_11_2018_16_05 
Merges: 08/11/2018 at 16:05
 2018-11-09 10:50:39 +00:00
Matthew Nesbit
8ecf4385dc
Merge pull request #1552 from corda/mnesbit-artemis-close-when-disconnected 
ENT-2704: Improve artemis client shutdown time when disconnected
 2018-11-09 09:20:58 +00:00
Michele Sollecito
420b2ccd40 Merge branch 'master' into merges/08_11_2018_16_05 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/EnterpriseConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-11-08 18:20:02 +00:00
Michele Sollecito
6a90f42eba Added enterprise specific fields to V1NodeConfigurationSpec. 2018-11-08 18:00:47 +00:00
Michele Sollecito
b6b37ad6f4 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:54:09 +00:00
Michele Sollecito
545dd25ef3 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:25:41 +00:00
Michele Sollecito
69921669e7 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:18:44 +00:00
Michele Sollecito
92ab3ab025 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:17:26 +00:00
Matthew Nesbit
0b134eee86 Improve artemis client shutdown time when disconnected and don't block on commit if Artemis is already closing. 2018-11-08 17:04:13 +00:00
Michele Sollecito
1671f7da31 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:00:03 +00:00
Michele Sollecito
fe581f8cf1 Working on merging changes to NodeConfigurationImpl. 2018-11-08 16:52:30 +00:00
Michele Sollecito
bd336ed4a7 Fixed compilation for NodeConfigurationImplTest 2018-11-08 16:48:11 +00:00
Michele Sollecito
11c7c879eb Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05 
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-11-08 16:39:09 +00:00
bpaunescu
41f5c530b2
ENT-2577 Custom SSL props for external Artemis connections (#1549) 
* ENT-2577 added additional node config for external artemis ssl config

* ENT-2577 update tests for external p2p broker

* ENT-2577 rename new config
 2018-11-08 16:31:02 +00:00
Michele Sollecito
6c749889d0
[CORDA-1993]: Replace reflection-based NodeConfiguration parsing with versioned property-based parsing mechanism. (#4132) 2018-11-08 15:56:00 +00:00
Rick Parker
9277042db8
ENT-2695 Restore async logging (#4195) 
* Replace error code generation technique with custom event re-writer.
Switch to RandomAccessFile appenders because they supposedly give higher throughput.

* Review feedback
 2018-11-08 14:33:45 +00:00
Viktor Kolomeyko
7a62e65ec7
ENT-2681: Re-throw original exception when parsing using old format failed. (#1550) 
* ENT-2681: Add explicit warning in the log explaining why parsing according to new configuration format has failed.
(Before trying ot use old config format)

* ENT-2681: Correctly report original error when parsing using old config format failed.
 2018-11-08 13:26:07 +00:00
szymonsztuka
bac265d418
Merge pull request #1548 from corda/merges/os-merge-to-ecbf23a 
Merge OS ->ENT to ecbf23a.
 2018-11-08 12:02:31 +00:00
Joel Dudley
99f6cc9e65
Updates tutorial to match template changes. (#4201) 2018-11-08 11:30:04 +00:00
szymonsztuka
611ca53cf7
Added missing ALIAS_PRIVATE_KEY static field to API Stability check. (#4194) 2018-11-08 10:21:45 +00:00
Joel Dudley
9c508673cf
Updates tutorial to match template changes. (#4170) 
* Updates tutorial to match template changes.

* Updates hello, world tutorials to match new template structures.
 2018-11-08 10:19:03 +00:00
Viktor Kolomeyko
400346fff0
ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity (#1537) 
* ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity

One of our customers currently using HTTP proxy without which outbound connection from Corda Node cannot be established.
Also, propagate `trace` setting correctly down the Bridge stack.

* ENT-2669: Compilation fixes.

* ENT-2669: Revert deleted constructor back.

* ENT-2669: First stub on HTTP Proxy integration test.

* ENT-2669: Minor changes.

* ENT-2669: Reduce test to bare minimum.

* ENT-2669: Attempt to write own HttpProxy.

* ENT-2669: Another attempt to make programmatic HttpProxy work.

* ENT-2697: Disable DNS resolution before sending requests to proxies.

* ENT-2669: Switch to use Jetty HttpProxy for integration testing.

* Adds a pipeline logger ahead of the proxy stage if trace is set. The logging is removed once the proxy completes.

Define a constant for pipeline stage.
 2018-11-08 09:04:36 +00:00
szymonsztuka
c0dd26cecc Typo mistakenly committed. 2018-11-07 21:18:05 +00:00
szymonsztuka
c3fa8951af Missing static field in api-current.txt - move at alphabetical position. 2018-11-07 19:12:37 +00:00
szymonsztuka
f6086a50aa Missing static field in api-current.txt. 2018-11-07 19:04:14 +00:00
szymonsztuka
44dfa23ad5 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a 2018-11-07 18:17:29 +00:00
Stefano Franz
90597e1736
really disable building installer dist on OS X (#1547) 2018-11-07 18:16:51 +00:00
Stefano Franz
ecbf23ab73
CORDA-2106: Print node info gen log on bootstrap failure (#4184) 
* print node-gen log when nodeInfo generation fails during bootstrapping

* add logic to print out the legal name of the node which failed to generate nodeInfo
 2018-11-07 19:05:50 +01:00
szymonsztuka
e956c0f5fe
Docs - link from the page about signing Cordapp to the page about node configuration regarding enabling Cordapp signed by dev key to be run in production mode (related to CORDA-1915). (#4172) 2018-11-07 16:48:31 +00:00
Christian Sailer
df954d36d2
Make the shell test pass when it happens to find the Integer constructor (#4187) 2018-11-07 16:37:42 +00:00
Patrick Kuo
459b330ebd
Add programmatic print help to CordaCliWrapper (#4177) 
* add programmatic print help to CordaCliWrapper

* address PR issues

* bug fix
 2018-11-07 14:14:58 +00:00
szymonsztuka
729b457332
Update to corda-grade-plugins version 4.0.34. (#4176) 2018-11-07 13:50:15 +00:00
Dominic Fox
f3b372d31d
CORDA-2099 make serializer factory interface (#4137) 
* Separate SerializerFactory construction from concrete implementation

* Fewer build methods

* Method naming that doesn't fatally confuse determinisation

* Extract SerializerFactory interface

* Reset to master's version of compiler.xml

* Un-ignore flickering test

* Remove unnecessary build method

* Whitespace

* Unused import

* Change build method

* Formatting fixes

* Fix test
 2018-11-07 13:48:45 +00:00
szymonsztuka
7f01f9ca61
Added new static method to API Stability check (related to CORDA-2011/CORDA-2057). (#4186) 2018-11-07 13:38:03 +00:00
szymonsztuka
7961124bca
Merge pull request #1545 from corda/merges/os-merge-to-6f00560 
OS -> ENT merge to 6f00560
 2018-11-07 13:28:07 +00:00
szymonsztuka
0a8aa828b3 API stability - Added new static method in Crypto. 2018-11-07 11:29:54 +00:00
szymonsztuka
9b57490b2d API stability - Added new static method in Crypto. 2018-11-07 11:16:54 +00:00
Stefano Franz
ba9852bbe9
add documentation for initiating flow modification (#4180) 2018-11-07 11:40:10 +01:00
szymonsztuka
19510315b4 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-6f00560 
# Conflicts:
#	core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
 2018-11-07 09:49:23 +00:00
Konstantinos Chalkias
da8dec0d63
[CORDA-2192] Corda specific OID for AliasPrivateKey (#4175) 2018-11-07 09:48:13 +00:00
Michal Kit
6f005605aa
CORDA-2187 & CORDA-2038: reverting maxTransactionSize <= maxMessageSize (#4166) 
* CORDA-2187 reverting maxTransactionSize <= maxMessageSize

* Addressing review comments

* Increasing the maxTransactionSize for the Bootstrapper

* Updating the testNetworkParameters
 2018-11-07 09:28:27 +00:00
James Brown
c205a10ec0
ENT-2684 Fix owasp dependency checker to fail builds based on CVSS level (#4169) 
OWASP Dependency Checker has been updated so that it can be configured to automatically fail a build when a vulnerable dependency is detected. This option is exposed through gradle settings, so that a build can be configured in TeamCity to pass/fail. This change is backward-compatible - i.e. it does not affect a build by default unless configured to do so.

Ability to fail a build is exposed by the new owasp.failBuildOnCVSS gradle property
By default this is set to '11.0' which will always pass a build even if a vulnerability is found (so will not affect anything by default)
Reduce the CVSS level between 0-10 to indicate what level to fail a build on
Example usage to catch Medium severity (and above) issues:

Configure gradle with the option -Powasp.failBuildOnCVSS=4
 2018-11-07 09:00:19 +00:00
josecoll
b692c59553
Merge pull request #1543 from corda/colljos-merge-to-015a36dad 
OS -> ENT merge
 2018-11-06 22:16:13 +00:00
Anthony Keenan
6fd724338a
CORDA-2183: Show root cause of error in console to aid with debugging (#4178) 
* Show root cause of error in console

* Add more explicit logical separator between message and root error

* Add default if e.cause is null
 2018-11-06 22:15:22 +00:00
szymonsztuka
d33aeb9881
Disable integration test with timing to run in database mode. (#1541) 
Disable TimedFlowMultiThreadedSMMTests running in database mode.
Added new logins for Azure SQL reference setup.
 2018-11-06 18:09:31 +00:00
Anthony Keenan
ac64b6c37c
Ignoring invalid test (works on Linux not on Windows) (#4173) 2018-11-06 17:31:11 +00:00
josecoll
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
Christian Sailer
105091548e
Merge pull request #1540 from corda/christians/merge_3260d9f 
Merge up to  3260d9f
 2018-11-06 16:07:41 +00:00
szymonsztuka
9efb4121d5
Don't check signers of META-INF/LIST.INDEX file (workaround for CORDA-2116) (#4148) 
Temporally treating META-INF/INDEX.LIST as unsignable entry because java.util.jar.JarVerifier doesn't load its signers. https://r3-cev.atlassian.net/browse/CORDA-2177 for further investigation.
 2018-11-06 14:34:03 +00:00