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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Ronan Browne
|
01ead5376b
|
ES-758: add corda remotes env vars to Jenkins logic (#7400)
* ES-758: add corda remotes
* ES-758: add corda remotes
|
2023-06-23 20:46:36 +01:00 |
|
Adel El-Beik
|
210a1999e8
|
Merge pull request #7396 from corda/cc/dev/os/4.8/security_vulnerabilities
ENT-10048,ENT-10050 - Security vulnerabilities
|
2023-06-19 11:09:49 +01:00 |
|
Chris Cochrane
|
89b2deebe3
|
Upgraded tcnative, for nett (previous commit)
|
2023-06-15 16:56:42 +01:00 |
|
Chris Cochrane
|
40f928da50
|
Upgrade netty
|
2023-06-15 14:35:49 +01:00 |
|
Adel El-Beik
|
0b8536b97c
|
Merge pull request #7395 from corda/shams-thread-names
ENT-10016: Give all node threads descriptive names
|
2023-06-09 16:05:48 +01:00 |
|
nargas-ritu
|
7a37ec3257
|
Merge pull request #7388 from corda/shams-vault-service-refactor
ENT-10013: Vault service refactoring backport
|
2023-06-09 14:06:05 +01:00 |
|
Shams Asari
|
5b3180bf7b
|
ENT-10016: Give all node threads descriptive names
|
2023-06-09 11:17:26 +01:00 |
|
Adel El-Beik
|
8ac05c2c34
|
Merge pull request #7389 from corda/connelm/ES-562/snyk-submodules-to-scan47
ES-562: Correct modules to scan for C4 OS Snyk scan nightly
|
2023-06-06 17:37:09 +01:00 |
|
Adel El-Beik
|
746e16bca0
|
Merge pull request #7390 from corda/connelm/ES-562/snyk-submodules-to-scan48
ES-562: Correct modules to scan for C4 OS Snyk scan nightly
|
2023-06-06 17:36:09 +01:00 |
|
Connel McGovern
|
596b51c2fd
|
Removing bridge/bridgecapsule from main release branch CI pipeline
|
2023-06-06 16:59:15 +01:00 |
|
Connel McGovern
|
ac9f3c150f
|
Include 'ES' jira code in PR title check
|
2023-06-06 16:59:14 +01:00 |
|
Connel McGovern
|
dfcc7019dc
|
ES-562: Correct modules to scan for C4 OS Snyk scan nightly
|
2023-06-06 16:57:27 +01:00 |
|
Connel McGovern
|
7b16352218
|
ES-562: Correct modules to scan for C4 OS Snyk scan nightly (#7386)
* ES-562: Correct modules to scan for C4 OS Snyk scan nightly
* Include 'ES' jira code in PR title check
|
2023-06-06 16:46:58 +01:00 |
|
Connel McGovern
|
51fc4910cc
|
Removing bridge/bridgecapsule from main release branch CI pipeline
|
2023-06-06 16:43:28 +01:00 |
|
Connel McGovern
|
df62044b6e
|
Include 'ES' jira code in PR title check
|
2023-06-06 16:42:50 +01:00 |
|
Connel McGovern
|
f212e0fd85
|
ES-562: Correct modules to scan for C4 OS Snyk scan nightly
|
2023-06-06 16:42:49 +01:00 |
|
Shams Asari
|
0bfce451ea
|
ENT-10013: Vault service refactoring backport
|
2023-06-06 16:17:58 +01:00 |
|
Shams Asari
|
a817218b08
|
ENT-9806: Added peer info to SSL handshake logging, and other changes for ENT merge (#7380)
|
2023-06-01 15:51:58 +01:00 |
|
Adel El-Beik
|
e15f92b526
|
Merge pull request #7355 from corda/shams-crl-netty-threads-blocked
ENT-9806: Netty threads no longer blocked if CRL endpoints are unresponsive
|
2023-05-27 10:43:41 +01:00 |
|
Adel El-Beik
|
763d1fa706
|
Merge pull request #7372 from corda/shams-vault-query-tx-order
ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates
|
2023-05-27 10:43:01 +01:00 |
|