ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 09:48:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,711 Commits 91 Branches 405 Tags 354 MiB
f548c8bdd5
Commit Graph

9711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chriscochrane
f548c8bdd5
Vulnerability updates 2024-07-17 09:48:54 +01:00
Sean Brereton
729883555f
Merge pull request #7746 from corda/merge-release/os/4.7-release/os/4.8-2024-06-10-218 
ES-2340: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-06-10
 2024-06-10 15:18:23 +01:00
r3-build
6408ffd065 Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-06-10 2024-06-10 10:29:54 +00:00
Sean Brereton
b608500fe5
ES-2340/Add snyk code (#7745) 2024-06-10 11:28:58 +01:00
Ronan Browne
5b2211af5d
Merge pull request #7725 from corda/merge-release/os/4.7-release/os/4.8-2024-05-01-177 
ES-2349: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-05-01
 2024-05-01 17:42:40 +01:00
r3-build
9bbdde5fbd Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-05-01 2024-05-01 12:34:09 +00: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
7185ba9f56
Merge pull request #7710 from corda/merge-release/os/4.7-release/os/4.8-2024-04-07-152 
ES-1919: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-04-07
 2024-04-07 19:38:35 +01:00
r3-build
9734c9c34f Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-04-07 2024-04-07 08:34:15 +00: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
bbc994882a
Merge pull request #7613 from corda/merge-release/os/4.7-release/os/4.8-2023-12-14-35 
ENT-11281: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
 2023-12-14 17:03:24 +00:00
r3-build
0dbdd08984 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14 2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895 ENT-11281/Activating forward merge logic 2023-12-14 14:57:13 +00:00
Adel El-Beik
f8925687a2
Merge pull request #7580 from corda/connelm/ES-1131/re-add-authenticateGradleWrapper 
ES-1131: Re-add authenticateGradleWrapper
 2023-11-20 11:38:01 +00:00
Connel McGovern
fa899c55c2 ES-1131: Re-add authenticateGradleWrapper 2023-11-20 11:05:54 +00:00
Ronan Browne
44bfb2821d
Merge pull request #7578 from corda/merge-release/os/4.7-release/os/4.8-2023-11-17-6 
ES-1331: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-11-17
 2023-11-19 19:13:06 +00:00
Adel El-Beik
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6 2023-11-18 18:10:07 +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
232eb47475
Merge pull request #7533 from corda/merge-release/os/4.7-release/os/4.8-2023-10-16-5 
ENT-10923: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-16
 2023-10-16 16:05:21 +01:00
r3-build
3ca2bb0b70 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-16 2023-10-16 12:29:46 +00:00
Rick Parker
aaf263059e
ENT-10923 Change code owners (#7531) 2023-10-16 13:28:18 +01:00
Adel El-Beik
aa77154601
Merge pull request #7522 from corda/merge-release/os/4.7-release/os/4.8-2023-10-05-4 
ENT-10860: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-05
 2023-10-05 15:17:05 +01:00
r3-build
4325131c27 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-05 2023-10-05 10:17:26 +00: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
8dd436ebc9
Merge pull request #7488 from corda/wzur-r3/ES-1313/merge/release/os/4.7/with/release/os/4.8/2023-09-07 
ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8
 2023-09-07 18:21:55 +01:00
Waldemar Zurowski
fd55e4c8d4 ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 16:08:20 +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
Adel El-Beik
517884a96e
Merge pull request #7474 from corda/adel/ENT-10693-os 
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow…
 2023-09-04 12:47:00 +01:00
Waldemar Żurowski
5ff4b4e8f6
Merge pull request #7473 from corda/merge-release/os/4.7-release/os/4.8-2023-09-01-1 
ES-412 Merging release/os/4.7 to release/os/4.8
 2023-09-01 17:22:13 +01:00
Adel El-Beik
dc51f10832 ENT-10694: Switch the noisy SSL handshake to trace logging. But allow it to be enabled again with a system property. 2023-09-01 14:48:56 +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
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