ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,542 Commits 91 Branches 405 Tags 354 MiB
release/os/4.7
Commit Graph

9542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waldemar Żurowski
f60074e2b5
ES-758: use remote cache for nightly publishing (#7784) 
* JFrog is shutting down JCenter completely and it is not longer
available
* as very short-term solution switch nightly publishing to R3
Artifactory cache, which already has all necessary binaries downloaded
from JCenter previously
* add missing configuration for Develocity (formerly Gradle Enterprise)
for remote caches
 2024-08-13 09:26:00 +01:00
Sean Brereton
b608500fe5
ES-2340/Add snyk code (#7745) 2024-06-10 11:28:58 +01:00
Adel El-Beik
d75c540760
Merge pull request #7724 from corda/ronanb/ES-2349/update-cron 
ES-2349: update Crons to not run at the weekend
 2024-05-01 13:32:36 +01:00
Ronan Browne
1f2dea4eb1 ES-2349: update Crons to not run at the weekend 2024-05-01 10:38:19 +01:00
Adel El-Beik
50b65c0183
Merge pull request #7705 from corda/ES-1919/Update-Github-Workflows 
ES-1919/Update-Github-Workflows
 2024-04-02 10:45:34 +01:00
LukeBrowne-R3
764b47ad18 ES-1919/Update-Github-Workflows 2024-03-29 12:09:56 +00:00
Maciej Swierad
97310a8895 ENT-11281/Activating forward merge logic 2023-12-14 14:57:13 +00:00
Connel McGovern
5b846406c8
ES-1331: Enable Gradle Enterprise build scans & remote caching (#7574) 
* ES-1131: Enable Gradle Enterprise build scans & remote caching
 2023-11-17 17:41:45 +00:00
Rick Parker
aaf263059e
ENT-10923 Change code owners (#7531) 2023-10-16 13:28:18 +01:00
Rick Parker
3cdb8901b4
Don't bind unless shared memory says it is free (#7520) 2023-10-05 11:16:12 +01:00
Waldemar Żurowski
bae84b3c63
Merge pull request #7487 from corda/wzur-r3/ES-1313/merge/release/os/4.6/with/release/os/4.7/2023-09-07 
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
 2023-09-07 16:05:51 +01:00
Waldemar Zurowski
1c903b0ff2 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 14:06:10 +01:00
Waldemar Żurowski
dfe0ed294e
ES-1313: changes for better future forward merges (#7486) 
* add more comments as a form of documentation
* move variable names away from calling pipeline for better experience
of future forward merges if pipeline parameters were to change
 2023-09-07 14:39:02 +02:00
Waldemar Żurowski
ddcb8adfc0
Merge pull request #7485 from corda/wzur-r3/ES-1313/merge/release/os/4.6/with/release/os/4.7/2023-09-07 
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
 2023-09-07 13:34:34 +01:00
Waldemar Zurowski
658e7217a3 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7 
Conflicts:

* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 11:27:57 +01:00
Ronan Browne
8e2115293a
ES-1313: Update Jenkinsfile for slack channel (#7484) 2023-09-07 11:49:33 +02: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
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