Dan Newton
619a2c9af3
Merge pull request #6402 from corda/NOTICK-rfowler-merge-OS4.4-OS4.5-20200626
...
NOTICK rfowler merge os4.4 os4.5 20200626
2020-06-26 12:12:51 +01:00
Ryan Fowler
881d8d687c
Merge branch 'release/os/4.4' into NOTICK-rfowler-merge-OS4.4-OS4.5-20200626
2020-06-26 09:52:16 +01:00
Ryan Fowler
ef582900cf
NOTICK Expand the regex to match what we already do in ENT ( #6400 )
2020-06-25 17:26:55 +01:00
Waldemar Zurowski
3377df2212
Switched to CMD for Windows Server
...
* when using shell there are huge performance penalty
2020-06-20 17:26:57 +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
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
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
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
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
James Higgs
24b0240d82
EG-2654 - Ensure stack traces are printed to the logs in error reporting ( #6345 )
...
* EG-2654 Ensure stack trace is printed to the logs in error reporting
* EG-2654 - Add a test case for exception logging
2020-06-17 14:32:12 +01:00
Adel El-Beik
debc962d1d
Merge remote-tracking branch 'origin/release/os/4.3' into adel/merge-4.3-to-4.4-17June
2020-06-17 10:06:34 +01:00
Dan Newton
7ab6a8f600
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.
2020-06-16 09:22:26 +01:00
Waldemar Żurowski
4b63bab4fc
Merge pull request #6346 from corda/raz/os44to45
...
NOTICK: MERGE OS 4.4 -> OS 4.5
2020-06-12 17:11:01 +01:00
James Higgs
2c253d806d
EG-2684 Ensure original message is logged with old-style error codes ( #6340 )
...
* [EG-2684] Ensure original message is logged with old-style error codes
* [EG-2684] Address detekt issues
2020-06-12 16:52:01 +01:00
Schife
b39aaacd3a
Merge branch 'release/os/4.4' of https://github.com/corda/corda into raz/os44to45
2020-06-12 15:35:33 +01:00
Razvan Codreanu
2b7c220522
INFRA-387 preallocation and deployNodes migration to Code Checks ( #6339 )
...
* preallocate for slow integration tests as well
2020-06-12 15:30:15 +01:00
Chris Rankin
ef00fa1388
CORDA-3738: Upgrade to DJVM 1.1. ( #6338 )
2020-06-12 13:04:09 +01:00
James Higgs
6e349f298e
NOTICK - Ignore a potentially dodgy test ( #6336 )
2020-06-11 16:47:48 +01:00
Joseph Zuniga-Daly
d7e55ed4e5
CORDA-3837: When delivering a lifecycle event, copy the database context into the lifecycle event thread ( #6331 )
2020-06-11 11:14:51 +01:00
Ryan Fowler
48ed9dbc6b
NOTICK: Fix IRSDemo code to wait for a response when updating day ( #6329 )
2020-06-10 18:30:00 +01:00
James Higgs
58af87c988
EG-2225 - Create log directory in correct place with verbose flag set ( #6321 )
...
* Ensure logs directory is written to correct location
* Remove a superfluous set of log path property
* Add a unit test to catch bad log paths
* Address detekt issues
2020-06-10 10:46:57 +01:00
James Higgs
8b7275eb97
EG-2564 - Move printed error to logger ( #6323 )
2020-06-10 10:45:50 +01:00
Christian Sailer
550b446b87
NOTICK Remove example code ( #6327 )
...
* Remove example code
2020-06-09 17:39:51 +01:00
Waldemar Żurowski
c897280143
Merge pull request #6317 from corda/ramzi/44-45-merge
...
OS 4.4 -> 4.5 merge 20200605
2020-06-05 17:32:05 +01:00
Ramzi El-Yafi
40a29869c2
Merge remote-tracking branch 'origin/release/os/4.4' into ramzi/44-45-merge
2020-06-05 15:27:34 +01:00
Razvan Codreanu
cf8cd8e004
INFRA-348 JDK 11 Compatibility job migration ( #6311 )
2020-06-05 15:20:03 +01:00
Razvan Codreanu
f27240b1ad
INFRA-381 Removing sonarqube ( #6312 )
2020-06-04 15:06:36 +01:00
Ramzi El-Yafi
6ab6099075
[INFRA-368] Add deployNodes and install gradle tasks ( #6302 )
2020-06-03 14:05:12 +01:00
James Higgs
04ddb267fd
[EG-2225] Prevent extra directories being created when relative base directories are specified ( #6282 )
...
Don't create an extra directory if a relative base path specified
2020-06-02 15:26:40 +01:00
James Higgs
ac9f6fca16
[EG-2148] Small tweak to an error message ( #6263 )
2020-06-02 13:52:34 +01:00
Matthew Nesbit
eb621dc942
Merge pull request #6298 from corda/ramzi/44-45-merge
...
OS 4.4 -> 4.5 merge 20200601
2020-06-01 16:23:54 +01:00
Ramzi El-Yafi
078c4f30fb
Merge remote-tracking branch 'origin/release/os/4.4' into ramzi/44-45-merge
2020-06-01 15:12:10 +01:00
Ramzi El-Yafi
a9b8751ce7
[INFRA-351] Jenkinsfile for code check jobs ( #6294 )
2020-05-29 13:08:00 +01:00