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
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Adel El-Beik
|
832af0d09e
|
Merge pull request #7356 from corda/adel/ENT-9883-OS4.6
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:33:55 +01:00 |
|
Adel El-Beik
|
657aa64988
|
Merge pull request #7357 from corda/adel/ENT-9883-OS4.7
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:33:21 +01:00 |
|
Adel El-Beik
|
708fe93039
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:30:24 +01:00 |
|
Adel El-Beik
|
ee50313260
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:24:39 +01:00 |
|
Rick Parker
|
097011784b
|
Merge pull request #7350 from corda/cc/merge/os-4.6-os-4.7/24-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-25 08:49:36 +01:00 |
|
Chris Cochrane
|
91c38fa84b
|
Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
Fwd-merge from OS 4.6.
|
2023-04-24 20:13:50 +01:00 |
|
Adel El-Beik
|
58366caa3d
|
Merge pull request #7340 from corda/cc/merge/os-4.5-os-4.6/20-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-24 14:57:34 +01:00 |
|
Chris Cochrane
|
e5a6cac9e8
|
Flakey test fix
|
2023-04-21 16:00:19 +01:00 |
|
Chris Cochrane
|
fc758ab766
|
Update build.gradle
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
|
2023-04-20 17:14:23 +01:00 |
|
Chris Cochrane
|
c58c49d27a
|
Upgrade corda/crash, snakeyaml
|
2023-04-20 14:01:20 +01:00 |
|
Adel El-Beik
|
845a72cf5b
|
Merge pull request #7337 from corda/cc/os/4.5/ent-7033/upgrade_shiro
ENT-7033 - upgrade shiro
|
2023-04-20 10:10:40 +01:00 |
|
Chris Cochrane
|
641a47bf32
|
Upgraded shiro to address security issues
|
2023-04-20 07:37:00 +01:00 |
|
Adel El-Beik
|
f906bfc14b
|
Merge pull request #7335 from corda/cc/os/4.5/security_vulnerabilities
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096 - dependency updates
|
2023-04-19 15:35:17 +01:00 |
|
Chris Cochrane
|
c263ba7563
|
Updated to fix Jackson tests
|
2023-04-19 13:06:35 +01:00 |
|
Chris Cochrane
|
29dfda3730
|
Resolved build-check issues
|
2023-04-18 20:34:42 +01:00 |
|
Chris Cochrane
|
dfbfda5520
|
Upgrade corda/crash
|
2023-04-18 19:30:22 +01:00 |
|
Ronan Browne
|
2ffe2eafcb
|
Merge pull request #7333 from corda/ronanb/merge-4.6-4.7-2023-04-17
INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17
|
2023-04-18 17:11:24 +01:00 |
|
Ronan Browne
|
1e7a515a8a
|
INFRA-2040: Merging forward updates from 4.6 to 4.7
|
2023-04-17 17:26:39 +01:00 |
|
Ronan Browne
|
f189fad14a
|
Merge pull request #7331 from corda/ronanb/merge-4.5-4.6-2023-04-16
* INFRA-1955: Shared lib implicit import syntax
* INFRA-2040: remove lingering nexus code (#7330)
|
2023-04-17 17:22:53 +01:00 |
|
Ronan Browne
|
5e9dee18b1
|
INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16)
|
2023-04-16 18:23:22 +01:00 |
|
Ronan Browne
|
2e9f62f4da
|
INFRA-2040: remove lingering nexus code (#7330)
|
2023-04-16 18:19:43 +01:00 |
|
Chris Cochrane
|
95c4a18352
|
ENT-6336,ENT-6960 - upgrade snakeyaml to address security vulnerabilities
|
2023-04-06 19:14:30 +01:00 |
|
Adel El-Beik
|
55ef162764
|
Merge pull request #7314 from corda/connelm/INFRA-1955/shared-lib-import-syntax4.7
INFRA-1955: Shared lib implicit import syntax
|
2023-03-17 10:09:10 +00:00 |
|
Connel McGovern
|
6e56dffba8
|
INFRA-1955: Shared lib implicit import syntax (#7313)
|
2023-03-15 14:49:10 +00:00 |
|
Ronan Browne
|
212cee2406
|
Merge pull request #7312 from corda/connelm/INFRA-1955/shared-lib-import-syntax
INFRA-1955: Shared lib implicit import syntax
|
2023-03-15 14:49:01 +00:00 |
|