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
|
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
|
a104923cd6
|
ENT-10606: fix shell artifact resolution (#7458)
|
2023-08-24 16:44:35 +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 |
|
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 |
|
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
|
306951c97d
|
ES-657: add auto import and snyk scanning for c4 corda community docker images (#7415)
|
2023-07-17 18:27:28 +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 |
|
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 |
|
Rick Parker
|
e6a808226e
|
Merge pull request #7412 from corda/shams-4.9-merge-0b8536b9
ENT-10013, ENT-10016: 4.8 to 4.9 forward merge
|
2023-07-13 09:38:08 +01:00 |
|
Ronan Browne
|
6bcc843f19
|
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
|
2023-07-13 07:07:17 +01:00 |
|
Ronan Browne
|
c58bb4a090
|
Merge pull request #7418 from corda/ronanb/merge--4.6-4.7-2023-07-12
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
|
2023-07-13 06:52:08 +01:00 |
|
Ronan Browne
|
010a9a6c08
|
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
|
2023-07-12 20:02:32 +01:00 |
|
Ronan Browne
|
33df909cee
|
ES-757: update paramater in line with latest shared lib change (#7417)
|
2023-07-12 20:01:56 +01:00 |
|
Ronan Browne
|
b410cd2a5d
|
ES-853: update Artifactory refrences to new public location (#7416)
* ES-853: update artifactory references to new public location
|
2023-07-12 17:36:57 +01:00 |
|
Adel El-Beik
|
d6c858e42e
|
Merge pull request #7414 from corda/ES-757-Remove-Extra-paramater-from-the-calling-side
ES-757: ensure correct method is called with extra paramater
|
2023-07-12 11:11:50 +01:00 |
|
Ronan Browne
|
9dd0bd8509
|
ES-757: ensure correct method is called with extra paramater
|
2023-07-11 13:11:02 +01:00 |
|
Shams Asari
|
1e0f7cd690
|
Merge fix
|
2023-07-07 15:29:44 +01:00 |
|
Shams Asari
|
671ce9ef97
|
Merge branch 'os-4.8-merge-point' into shams-4.9-merge-0b8536b9
# Conflicts:
# .github/workflows/check-pr-title.yml
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
|
2023-07-07 15:20:43 +01:00 |
|
Ronan Browne
|
401a8593d2
|
Merge pull request #7411 from corda/ronanb/merge-4.7-4.8-2023-07-05
ES-839: Merging forward updates from 4.7 to 4.8 (2023-07-25)
|
2023-07-06 13:58:11 +01:00 |
|
Ronan Browne
|
5e3ee980b3
|
INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-07-05)
|
2023-07-05 20:54:02 +01:00 |
|
Ronan Browne
|
56c6eb42ef
|
ES-757: remove extra paramater (#7403)
|
2023-07-05 16:28:51 +01:00 |
|
Ronan Browne
|
6b1a2cb027
|
ES-839: Disable Internal docker publishing for 4.7 ( only supported post 4.9 pacthes) (#7410)
* ES-839: Disable Docker publishing for 4.7
* ES-839: remove broken repo
|
2023-07-05 16:28:08 +01:00 |
|
Chris Cochrane
|
e100bee4f1
|
ENT-10076,ENT-10080 - Security Vulnerabilities (#7405)
* Updated dependencies
* Address compiler checks
|
2023-06-28 13:20:58 +01:00 |
|
Chris Cochrane
|
d02f6ff68c
|
ENT-10048,ENT-10050 - Security vulnerabilities (#7397)
* Updated netty and tcnative
|
2023-06-27 13:29:28 +01:00 |
|
Ronan Browne
|
0afd220cfd
|
Merge pull request #7401 from corda/ronanb/merge-4.6-4.7-2023-06-23
ES-758: forward merge 4.6 -> 4.7
|
2023-06-26 08:59:12 +01:00 |
|
Ronan Browne
|
1dc94b438c
|
INFRA-2040: Merging forward updates from 4.6 to 4.7 (2023-06-23)
|
2023-06-23 20:50:53 +01:00 |
|