ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-21 22:07:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,149 Commits 91 Branches 405 Tags 354 MiB
a201a8d52b
Commit Graph

8149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rankin
a201a8d52b CORDA-2876: Fix serialization-djvm module for Java 11. (#5720) 2019-11-15 15:37:47 +00:00
Jonathan Locke
f071445221
CORDA-2876: Ensure that sandboxable byte-code is compiled for Java 8. (#5718) 
CORDA-2876: Ensure that sandboxable byte-code is compiled for Java 8. (#5718)
 2019-11-15 08:46:22 +00:00
Katelyn Baker
b1aa9b0e17
Merge pull request #5716 from corda/FEAT-43-r4.4b 
Merge release/os/4.3 -> release/os/4.4
 2019-11-14 16:27:17 +00:00
Chris Rankin
b1c164e26d CORDA-2876: Ensure that sandboxable byte-code is compiled for Java 8. 2019-11-14 16:22:28 +00:00
Oliver Knowles
4a8c73bf4a CORDA-2744 - Prevent ClassCastException if error during initial registration (#5712) 
* Prevent class cast exception if error during initial registration

* Appeasing detekt
 2019-11-14 16:13:08 +00:00
Katelyn Baker
84983ffb16 CORDA-3422 - Remove design docs from 4.4 2019-11-14 14:54:38 +00:00
Katelyn Baker
384dfca04e Merge branch 'release/os/4.3' into 'release/os/4.4' 2019-11-14 14:53:32 +00:00
Katelyn Baker
67bc985aeb
CORDA-3422 - Remove design docs from 4.1 (#5715) 2019-11-14 14:43:30 +00:00
Jonathan Locke
7d5c59e9cc
Merge OS 4.3 to OS 4.4 (#5713) 
Merge OS 4.3 to OS 4.4 (#5713)
 2019-11-14 13:07:09 +00:00
Chris Rankin
cc7d15bf52 CORDA-3414: Upgrade to Corda Gradle plugins 5.0.6. (#5711) 2019-11-14 12:11:30 +00:00
Jonathan Locke
612fd83893 Fixed node driver issue 2019-11-14 11:25:56 +00:00
Jonathan Locke
c31cddaffc Fixed merge conflicts 2019-11-14 10:40:12 +00:00
Katelyn Baker
a3bc4ff93a
Merge pull request #5709 from corda/FEAT-43-r4.4 
MERGE: 4.1 -> 4.3
 2019-11-14 09:24:16 +00:00
Chris Rankin
987415dd83 CORDA-3407: Install external byte-code cache for sandboxed CorDapps. (#5699) 2019-11-14 09:09:57 +00:00
Katelyn Baker
637c8524fc Merge branch 'release/os/4.1' into FEAT-43-r4.4 2019-11-13 19:16:09 +00:00
Katelyn Baker
8e4666961a
CORDA-3422 - Remove design docs from 4.0 (#5707) 2019-11-13 18:01:04 +00:00
Ed Prosser
11b94a5e50
Merge pull request #5703 from corda/EdP/CORDA-3181-merge-to-4.3 
Merge OS 4.1 -> OS 4.3
 2019-11-13 14:43:57 +00:00
Ed Prosser
14373ab5ab Merge remote-tracking branch 'origin/release/os/4.1' into EdP/CORDA-3181-merge-to-4.3 
# Conflicts:
#	constants.properties
#	docs/source/getting-set-up.rst
 2019-11-13 13:13:16 +00:00
Razvan Codreanu
7f3260e1b3 TM-89 fixing double archiving and misleading log (#5698) 2019-11-13 11:33:12 +00:00
Razvan Codreanu
71af7ad7cb Print remaining k8s pods on pod completion (#5697) 
* TM-87 printing remaining pods on pod completion

* TM-87 extra commit to unblock jenkins?

* TM-87 extra commit to unblock jenkins?

* TM-87 pr comments
 2019-11-13 11:32:54 +00:00
Jonathan Locke
bec865dc57
CORDA-3358: Add capsule-friendly argument to docs (#5627) 
CORDA-3358: Add capsule-friendly argument to docs (#5627)
 2019-11-13 10:36:07 +00:00
Ed Prosser
ed1216f622
Merge pull request #5532 from corda/CORDA-3181-4.1-EdP 
CORDA-3181 Correct JDK install instructions + streamlining
 2019-11-13 09:41:54 +00:00
Jonathan Locke
00c8d16644
NOTICK: Updated release notes for 4.3 (#5692) 
* NOTICK: Updated release notes for 4.3 (#5692)

Updated release notes for 4.3

* Clarification for old CI vs new CI

* Updated release notes

* Fixed broken links

* Addressed comments

* Added link

* Removed issues without a JIRA link

* Word change

* One more

* Mention deprecation of API

* Added Deprecations notice

* Moved confidential identities deprecation note
 2019-11-12 15:45:03 +00:00
Razvan Codreanu
296a8d4ba5 TM-84 Reduce noise when excluding tests (#5688) 
* TM-84 create intersection between includes and excludes and remove the intersection from the includes, that way we only print relevant exclusions instead of creating noise

* TM-84 add all instead of copy

* TM-84 remove xml from saved artifacts

* TM-84 reverting to default code to investigate behaviour

* TM-84 fixed intersection implementation

* TM-84 more logging to understand behaviour

* TM-84 more debugging

* TM-84 adding wildcard so contains works as expected

* TM-84 tweaking intersection closure

* TM-84 tweaking intersection

* TM-84 small change

* TM-84 suffixing wildcard

* TM-84 finishing up PR

* TM-84 PR comment
 2019-11-12 13:19:31 +00:00
Razvan Codreanu
cc0e92e988 TM-89 Moving pod log outside the temp folder (#5696) 
* TM-89 creating log outside of temp folder

* TM-89 reverting build.gradle changes now that the practical test worked. logs for each container can be viewed in the artifacts section
 2019-11-12 12:36:56 +00:00
Jonathan Locke
a1691c72a4
CORDA-3411: Correct links to github after branching strategy change (#5695) 
CORDA-3411: Correct links to github after branching strategy change (#5695)
 2019-11-12 10:56:25 +00:00
LankyDan
d94a3abd70 CORDA-3411 Correct links to github after branching strategy change 2019-11-11 13:26:42 +00:00
Stefano Franz
7fb404bd85
limit number of builds kept within jenkins history for regression builds (#5693) 2019-11-09 08:57:19 +00:00
Jonathan Locke
10c891c0be
CORDA-3406: Modify DemoBench to make using the DJVM obvious and optional (#5687) 
CORDA-3406: Modify DemoBench to make using the DJVM obvious and optional (#5687)
 2019-11-08 14:27:41 +00:00
Jonathan Locke
1ba3aebeba
CORDA-3192: Add an exception for Unrecoverable RPC errors (#5558) 
CORDA-3192: Add an exception for Unrecoverable RPC errors (#5558)
 2019-11-08 11:19:33 +00:00
Ivan Schasny
703318b5a0
Merge pull request #5683 from corda/bugfix/CORDA-3396-fixed-blob-inspector-npe 
CORDA-3396 fixed blob inspector npe
 2019-11-08 10:56:16 +00:00
Dimos Raptis
ed9117dce4 NOTICK - Fix typo in node services docs (#5689) 2019-11-08 10:19:06 +00:00
Ivan Schasny
7e6e172a81 CORDA-3396 removed wildcard import 2019-11-07 16:50:44 +00:00
Ivan Schasny
42f6856502 CORDA-3396 removed wildcard import 2019-11-07 16:50:44 +00:00
Ivan Schasny
34db285ac3 CORDA-3396 fixed NPE in BlobInspector. Added verbose message in the case of error. 2019-11-07 16:50:43 +00:00
Chris Rankin
6380feee41 CORDA-3406: Modify DemoBench to make using the DJVM obvious and optional. 2019-11-07 12:22:40 +00:00
Ryan Fowler
e4e2dfffd6 CORDA-3192: Add an exception for Unrecoverable RPC errors so that the 
RPC doesn't keep trying to reconnect when there's no reason to.
 2019-11-07 10:32:07 +00:00
Jonathan Locke
86f1f9e371
CORDA-3393: Lazy load MessageDeduplicationHandler.flowId (#5679) 
CORDA-3393: Lazy load `MessageDeduplicationHandler.flowId` (#5679)
 2019-11-07 09:44:03 +00:00
Dan Newton
b15db200e3 NOTICK: Quick and dirty change to stop "Unable to start notaries." error message (#5686) 
* Quick and dirty change to stop "Unable to start notaries." error message (#5686)

"Unable to start notaries. A required port might be bound already" is
returned whenever a startup error occurs while starting the notary nodes
in driver tests. This hides the real error.

This change prints the actual error to std_err and read from file
at a later point. This means the real error is not lost and will be
shown in failed builds.

* Suppress detekt warnings
 2019-11-07 09:43:29 +00:00
Tudor Malene
b1e5b659c1 ENT-4107: Document blob inspector issue (#5685) 
* ENT-4107 - document issue with enums in the blob inspector (#5685)

* ENT-4107 - fixed formatting
 2019-11-06 17:04:05 +00:00
Jonathan Locke
0445fac0e5
CORDA-3298: Update sql server driver version (#5684) 
CORDA-3298: Update sql server driver version (#5684)
 2019-11-06 17:03:21 +00:00
Chris Rankin
7708a3c28a CORDA-2876: Add explicit Kotlin dependencies to DJVM serialization modules. (#5678) 
* CORDA-2876: Add explicit Kotlin dependencies to DJVM serialization modules.

* Publish slf4j-api at compile scope for corda-core-deterministic.

* Bump Corda platform version to 6.
 2019-11-06 16:49:27 +00:00
Dimos Raptis
a88ee7d138 NOTICK - Fixes for advanced concepts docs (#5671) 2019-11-06 15:03:14 +00:00
Stefano Franz
996183dd2a
Merge pull request #5677 from corda/my_merge_branch 
Merge OS4.3 -> OS4.4
 2019-11-06 14:33:57 +00:00
Dimos Raptis
55525820cf [CORDA-3298] - Update sql server driver version 2019-11-06 13:35:21 +00:00
stefano
5d6fc34f88 fix merge issue with exception thrown in RpcExceptionHandlingTest 2019-11-06 12:28:05 +00:00
LankyDan
91f35d5967 CORDA-3393 Lazy load MessageDeduplicationHandler.flowId 
This is to potentially help with debugging in the future as the
`flowId` could become confusing for received messages where the `flowId`
has nothing to do with the current flow.
 2019-11-06 11:26:25 +00:00
stefano
03d8009c7d fix temp folder rules 2019-11-05 17:56:06 +00:00
stefano
d8ed3492b9 fix merge conflicts due to changes in Signed test cordapp creation 2019-11-05 17:42:38 +00:00
stefano
6a3a9eded3 Merge remote-tracking branch 'origin/release/os/4.3' into my_merge_branch 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
 2019-11-05 17:19:18 +00:00