Joseph Zuniga-Daly
19fbfa1414
Make file match original to remove from diff
2020-06-29 15:35:09 +01:00
Joseph Zuniga-Daly
e94c32f3fa
Remove need for external library in tests
2020-06-29 15:31:55 +01:00
Joseph Zuniga-Daly
223cfe640d
Remove unused imports
2020-06-26 15:06:03 +01:00
Joseph Zuniga-Daly
bc921f0cb4
Use kryo default for abstract classes
2020-06-26 14:20:57 +01:00
Joseph Zuniga-Daly
b1408453ee
Wire up the new CheckpointCustomSerializer interface
2020-06-26 14:18:54 +01:00
Joseph Zuniga-Daly
1c7258aee0
Add CheckpointCustomSerializer interface
2020-06-25 17:14:18 +01:00
Joseph Zuniga-Daly
050a36a677
Add test to check references are restored correctly
2020-06-25 11:40:47 +01:00
Joseph Zuniga-Daly
296202d541
Use 0 seconds when forcing a flow checkpoint inside test
2020-06-24 14:23:57 +01:00
Joseph Zuniga-Daly
fbe234574e
Tidy up the fetching of types
2020-06-24 12:58:40 +01:00
Joseph Zuniga-Daly
4ab9241416
Explain why we are looking for two type parameters when we only use one
2020-06-24 12:39:03 +01:00
Joseph Zuniga-Daly
d41a1f39fb
Give field a descriptive name
2020-06-24 12:33:26 +01:00
Joseph Zuniga-Daly
e95757426f
Remove unused proxyType field
2020-06-24 12:32:22 +01:00
Joseph Zuniga-Daly
b43ec6a103
Remove unused constructors from exception
2020-06-24 12:31:30 +01:00
Joseph Zuniga-Daly
65b6e05a98
Put calls to the userSerializer on their own lines to improve readability
2020-06-24 12:26:15 +01:00
Joseph Zuniga-Daly
dffc7e832b
Extract method
2020-06-24 11:42:04 +01:00
Joseph Zuniga-Daly
5f9d2a68bb
Rename exception
2020-06-24 11:38:09 +01:00
Joseph Zuniga-Daly
ae3396a7c3
Remove try/catch to fix TooGenericExceptionCaught detekt rule
2020-06-24 11:34:07 +01:00
Joseph Zuniga-Daly
a66e140185
CORDA-3717: Apply custom serializers to checkpoints
2020-06-24 11:15:08 +01:00
Chris Rankin
6485a025c7
ENT-5430: Increase test coverage when serializing Optional fields. ( #6387 )
2020-06-22 16:51:40 +01:00
Waldemar Żurowski
1a7e302d5f
Merge pull request #6385 from corda/release/os/4.5
...
NOTICK Merge OS 4.5 -> OS 4.6
2020-06-20 16:44:14 +01:00
Waldemar Żurowski
5bfc693a71
Merge pull request #6384 from corda/INFRA-357
...
INFRA-357 4.4 to 4.5 merge + JDK 11 regression build changes for tag publishing
2020-06-20 14:33:24 +01:00
Schife
84583d2a1c
INFRA-357 Re adding JDK 11 regression build file that was removed in the 4.4 to 4.5 merge
2020-06-20 11:25:20 +01:00
Schife
6a12cf34ad
Merge branch 'release/os/4.4' of https://github.com/corda/corda into INFRA-357
...
Conflicts:
testing/DockerfileJDK11Azul
2020-06-20 11:22:30 +01:00
Razvan Codreanu
e021022d0d
INFRA-357 Publish build tag ( #6375 )
2020-06-20 11:08:52 +01:00
Waldemar Zurowski
a7644dab8b
Cosmetic change for Windows Server builds
2020-06-19 22:09:02 +01:00
Waldemar Żurowski
ac0e35c854
Trying to ignore push events for Windows Server builds ( #6383 )
2020-06-19 22:03:09 +01:00
Waldemar Żurowski
967de2f0ba
Merge pull request #6382 from corda/merge-45-to-46
...
NOTICK: Merge Corda OS 4.5 to 4.6
2020-06-19 19:49:44 +01:00
Waldemar Zurowski
1a4efbac7f
Merge branch 'release/os/4.5' into merge-45-to-46
2020-06-19 19:48:08 +01:00
Waldemar Żurowski
99b761e0e2
Merge pull request #6381 from corda/merge-44-to-45
...
NOTICK: merge Corda OS 4.4 to 4.5
2020-06-19 19:44:13 +01:00
Waldemar Zurowski
f1fcce4247
Merge branch 'release/os/4.4' into merge-44-to-45
2020-06-19 19:42:19 +01:00
Waldemar Żurowski
8a601e6d62
Merge pull request #6380 from corda/merge-43-to-44
...
NOTICK: forward merge from Corda OS 4.3 to 4.4
2020-06-19 19:35:19 +01:00
Waldemar Zurowski
f7b38f0b6d
Merge branch 'release/os/4.3' into merge-43-to-44
2020-06-19 19:32:55 +01:00
Waldemar Żurowski
23f81e73a6
Remove obsolete Jenkins configration for smoke tests ( #6379 )
2020-06-19 19:30:11 +01:00
Razvan Codreanu
618f7211bb
NOTICK fix regression jenkinsfile typo ( #6376 )
2020-06-19 18:25:08 +01:00
Razvan Codreanu
ad21e381dc
INFRA-357 Adding JDK 11 Regression and Build tag jenkinsfile ( #6374 )
2020-06-19 14:10:31 +01:00
Waldemar Żurowski
f7f2b0cea4
Merge pull request #6373 from corda/merge-44-45
...
NOTICK: merging OS 4.4 with OS 4.5
2020-06-19 11:34:39 +01:00
Waldemar Zurowski
68771cf430
Merge branch 'release/os/4.4' into merge-44-45
2020-06-19 11:02:34 +01:00
pnemeth
d6cab0e131
EG-1557 - Configuration data from "include" section ignored while command line contains the path to config file without leading ./ ( #6354 )
...
Configuration data from "include" section ignored while command line contains the path to config file without leading ./
2020-06-19 10:32:55 +01:00
alicer3
e77f7a7546
center console message for registration ( #6191 )
2020-06-19 09:49:07 +01:00
Euan Cairncross
4bfb595e57
INFRA-357 - Add release tag Jenkins build for OS 4.4 ( #6362 )
2020-06-18 23:46:29 +01:00
Waldemar Żurowski
494073590b
INFRA-347: Corda builds for Windows Servers ( #6356 )
2020-06-18 23:19:06 +01:00
Dan Newton
71b2a43221
Merge pull request #6372 from corda/dan/os-4.5-to-4.6-merge-2020-06-18
...
NOTICK OS 4.5 to 4.6 merge 2020-06-18
2020-06-18 17:04:42 +01:00
LankyDan
56d0bbc036
CORDA-3841 Check isAnyCheckpointPersisted in startFlowInternal ( #6351 )
...
Only hit the database if `StateMachineState.isAnyCheckpointPersisted`
returns true. Otherwise, there will be no checkpoint to retrieve from the
database anyway. This can prevent errors due to a transient loss of
connection to the database.
Update tests after merging to 4.6
2020-06-18 16:15:15 +01:00
LankyDan
e8b17ff7b9
Merge branch 'release/os/4.5' into dan/os-4.5-to-4.6-merge-2020-06-18
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
2020-06-18 15:50:46 +01:00
Razvan Codreanu
813e9dd242
INFRA-394 enable full junit log to avoid truncation ( #6368 )
2020-06-18 12:52:33 +01:00
Matthew Nesbit
5b3ca5f112
Merge pull request #6367 from corda/chrisr3-os44-merge
...
NOTICK: Merge from OS 4.4 -> OS 4.5 up to fe61781
2020-06-18 12:03:21 +01:00
Chris Rankin
1ef62870bb
Merge commit 'fe617818895edab334d80c5e8de2b38f39e67af6' into chrisr3-os44-merge
2020-06-17 18:54:54 +01:00
Rick Parker
fe61781889
Merge pull request #6358 from corda/adel/merge-4.3-to-4.4-17June
...
Merge OS 4.3 to OS 4.4
2020-06-17 18:13:55 +01:00
Chris Rankin
d0c0a1d9ba
ENT-5430: Fix deserialisation of commands containing generic types. ( #6359 )
2020-06-17 17:28:26 +01:00
Walter Oggioni
d1482fb6a8
removed duplicate gradle include ( #6330 )
...
subproject `tools:checkpoint-agent` is already included at line 63
2020-06-17 17:13:30 +01:00
