Adel El-Beik
|
fb7e7057de
|
Merge pull request #7471 from corda/adel/ENT-10694-os
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow…
|
2023-09-01 14:39:50 +01:00 |
|
Waldemar Żurowski
|
3d8636c716
|
updated for new branch
|
2023-09-01 14:55:04 +02:00 |
|
r3-build
|
fe9483d331
|
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-09-01
|
2023-09-01 12:47:45 +00:00 |
|
Waldemar Żurowski
|
863ea10934
|
Merge pull request #7472 from corda/merge-release/os/4.6-release/os/4.7-2023-09-01-1
ES-412 Merging release/os/4.6 to release/os/4.7
|
2023-09-01 13:46:42 +01:00 |
|
Waldemar Żurowski
|
267b500c93
|
updated forward merged to new branch
|
2023-09-01 11:56:24 +02:00 |
|
r3-build
|
8349675a23
|
Merging forward updates from release/os/4.6 to release/os/4.7 - 2023-09-01
|
2023-09-01 09:51:40 +00:00 |
|
Waldemar Żurowski
|
b0f86e26f9
|
ES-412: added automatic forward merge for Corda 4 (#7469)
* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
|
2023-09-01 10:50:47 +01:00 |
|
Adel El-Beik
|
134ff60af8
|
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow it to be enabled again with a system property.
|
2023-08-31 18:33:34 +01:00 |
|
Waldemar Żurowski
|
f029420ed8
|
Merge pull request #7467 from corda/merge-release/os/4.9-release/os/4.10-2023-08-31-14
ENT-10606 Merging release/os/4.9 to release/os/4.10
|
2023-08-31 12:06:44 +01:00 |
|
r3-build
|
aa6e5000c8
|
"Merging forward updates from release/os/4.10 to release/os/4.9 - 2023-08-31"
|
2023-08-31 08:20:47 +00:00 |
|
Waldemar Żurowski
|
0bcda08180
|
Merge pull request #7466 from corda/wzur-r3/INFRA-1804/merge/release/os/4.8/with/release/os/4.9/2023-08-30
INFRA-1804: Merging forward updates from release/os/4.8 to release/os/4.9
|
2023-08-31 09:20:19 +01:00 |
|
Waldemar Zurowski
|
d1a36d296b
|
INFRA-1804: Merging forward updates from release/os/4.8 to release/os/4.9
|
2023-08-30 19:45:47 +01:00 |
|
Waldemar Żurowski
|
266bb4fa2f
|
Merge pull request #7465 from corda/wzur-r3/INFRA-1804/merge/release/os/4.7/with/release/os/4.8/2023-08-30
INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8
|
2023-08-30 19:23:38 +01:00 |
|
Waldemar Zurowski
|
849f8666a6
|
INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8
|
2023-08-30 16:40:20 +01:00 |
|
Waldemar Żurowski
|
672798c187
|
Merge pull request #7464 from corda/wzur-r3/INFRA-1804/merge/release/os/4.6/with/release/os/4.7/2023-08-30
INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7
|
2023-08-30 16:24:50 +01:00 |
|
Waldemar Zurowski
|
5daa091fdc
|
INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7
|
2023-08-30 14:30:31 +01:00 |
|
Waldemar Żurowski
|
00b1f3d2c7
|
INFRA-1804: revert back to standard agent (#7463)
* Snyk binaries have been already incorporated into standard Jenkins
agent
|
2023-08-30 15:28:29 +02:00 |
|
Ronan Browne
|
00bb9dd259
|
Merge pull request #7460 from corda/ronanb/merge-4.9-4.10-2023-08-24
ENT-10606: Merging forward updates from 4.9 to 4.10 (2023-08-24)
|
2023-08-24 19:48:58 +01:00 |
|
Ronan Browne
|
2691ecd5fa
|
ENT-10606: Merging forward updates from 4.9 to 4.10 (2023-08-24)
|
2023-08-24 16:48:04 +01:00 |
|
Ronan Browne
|
a104923cd6
|
ENT-10606: fix shell artifact resolution (#7458)
|
2023-08-24 16:44:35 +01:00 |
|
Ronan Browne
|
c00dab34f7
|
Merge pull request #7456 from corda/ronanb/merge-4.9--4.10-2023-08-23
ES-1140: Merging forward updates from 4.9 to 4.10 (2023-07-20)
|
2023-08-23 17:14:53 +01:00 |
|
Ronan Browne
|
d105415fb0
|
ES-1140: Merging forward updates from 4.7 to 4.8 (2023-07-20)
|
2023-08-23 16:40:17 +01:00 |
|
Rick Parker
|
53fe0e6cf8
|
Merge pull request #7453 from corda/shams-4.10-merge-c8135331
ENT-6876, ENT-10045: 4.9 to 4.10 forward merge
|
2023-08-23 14:32:36 +01:00 |
|
Ronan Browne
|
66a49ea4cd
|
Reverted changes to lib/quasar.jar from the previous commit (#7454)
|
2023-08-22 13:38:16 +01:00 |
|
Ronan Browne
|
a60ed8e479
|
ES-1140: use java 8u382 in base image
|
2023-08-22 13:06:23 +01:00 |
|
Shams Asari
|
46914a2b35
|
Merge branch 'release/os/4.9' into shams-4.10-merge-c8135331
|
2023-08-22 11:24:38 +01:00 |
|
Rick Parker
|
c813533191
|
Merge pull request #7450 from corda/shams-4.9-merge-5cdbec9d
ENT-6876: 4.8 to 4.9 forward merge
|
2023-08-22 11:11:38 +01:00 |
|
Shams Asari
|
fb303a20bf
|
Merge branch 'release/os/4.8' into shams-4.9-merge-5cdbec9d
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
|
2023-08-21 14:18:09 +01:00 |
|
Shams Asari
|
5cdbec9ddf
|
ENT-6876: Optimised vault query to not query for total state count if the first page isn't full (#7449)
|
2023-08-21 10:30:42 +01:00 |
|
Adel El-Beik
|
f0cdc6a25e
|
Merge pull request #7439 from corda/shams-externalid-multiple-keys-bug
ENT-10045: Fix vault query bug when same externalId is mapped to multiple keys
|
2023-08-01 10:15:56 +01:00 |
|
Shams Asari
|
4b7e2a3995
|
ENT-10045: Fix vault query bug on externalId and mapping with multiple keys
|
2023-07-26 12:46:27 +01:00 |
|
Adel El-Beik
|
8ad072e3fa
|
Merge pull request #7428 from corda/tom/ENT-9875/net-params-backwards-compatability-test
ENT-9875: Added test to deserialise 4.11 network params
|
2023-07-20 15:27:57 +01:00 |
|
Waldemar Żurowski
|
6abbc6a973
|
Merge pull request #7434 from corda/wzur-r3/ES-839/merge/release/os/4.9/with/release/os/4.10/2023-07-18
ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18)
|
2023-07-18 11:24:33 +01:00 |
|
Waldemar Zurowski
|
fa10eb39c2
|
ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18)
|
2023-07-18 08:49:20 +01:00 |
|
Ronan Browne
|
08baf823a5
|
Merge pull request #7431 from corda/ronanb/merge-4.9--4.10-2023-07-17
ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17)
|
2023-07-18 08:43:38 +01:00 |
|
Waldemar Żurowski
|
c7296c0deb
|
Merge pull request #7433 from corda/wzur-r3/ES-839/merge/release/os/4.8/with/release/os/4.9/2023-07-17
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
|
2023-07-18 08:33:33 +01:00 |
|
Waldemar Zurowski
|
e23efb0b2d
|
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
|
2023-07-17 22:57:24 +01:00 |
|
Waldemar Żurowski
|
6a22494431
|
Merge pull request #7432 from corda/wzur-r3/ES-839/merge/release/os/4.7/with/release/os/4.8/2023-07-17
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
|
2023-07-17 22:50:56 +01:00 |
|
Waldemar Zurowski
|
36940d228f
|
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
|
2023-07-17 19:34:19 +01:00 |
|
Waldemar Żurowski
|
5a31ed0f23
|
ES-839: fix for dropping Zulu repository (#7429)
* make sure `rm` doesn't fail if the file is not present
* it makes it easier for forward merge to a branch with newer base image
without that file
|
2023-07-17 19:05:58 +01:00 |
|
Ronan Browne
|
e59145dd61
|
ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17)
|
2023-07-17 18:37:05 +01:00 |
|
Ronan Browne
|
306951c97d
|
ES-657: add auto import and snyk scanning for c4 corda community docker images (#7415)
|
2023-07-17 18:27:28 +01:00 |
|
tomstark99
|
639acc4c63
|
Added test to deserialise 4.11 network params
|
2023-07-17 14:35:16 +01:00 |
|
Ronan Browne
|
26c18acf8f
|
Merge pull request #7424 from corda/connelm/merge-4.9-4.10-2023-07-14
ES-853: Merging forward updates from 4.9 to 4.10 (2023-07-14)
|
2023-07-17 09:47:59 +01:00 |
|
Connel McGovern
|
52f2e8e2e6
|
ES-853: Correcting forward merge
|
2023-07-14 18:23:17 +01:00 |
|
Connel McGovern
|
b01f85fb11
|
Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14
# Conflicts:
# build.gradle
|
2023-07-14 18:19:55 +01:00 |
|
Adel El-Beik
|
45c021326f
|
Merge pull request #7421 from corda/ronanb/merge-4.8-4.9-2023-07-13
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
|
2023-07-14 17:34:32 +01:00 |
|
Rick Parker
|
6b655c0f91
|
Merge pull request #7420 from corda/shams-4.10-merge-e6a80822
ENT-9806, ENT-9941, ENT-8827, ENT-10013, ENT-10016: Forward merge 4.9 to 4.10
|
2023-07-14 13:28:44 +01:00 |
|
Ronan Browne
|
befae353ac
|
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
|
2023-07-13 15:25:55 +01:00 |
|
Ronan Browne
|
7a27a464f6
|
Merge pull request #7419 from corda/ronanb/merge-4.7-4.8-2023-07-13
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
|
2023-07-13 15:12:05 +01:00 |
|