Commit Graph

9689 Commits

Author SHA1 Message Date
Waldemar Żurowski
39e8cad441
Update JenkinsfileSnykScan 2023-03-17 11:31:25 +01:00
Ronan Browne
cda39f8540 INFRA-1957 inital commit allow C4 to use snyk pipeline 2023-03-11 08:47:42 +00:00
Adel El-Beik
dae8f06afd
Merge pull request #7304 from corda/adel/ENT-9476-api-fix
ENT-9476: Added in missing Kotlin API.
2023-03-08 09:49:01 +00:00
Adel El-Beik
ec67e77c76 ENT-9476: Added in missing Kotlin API. 2023-03-07 18:18:37 +00:00
Adel El-Beik
e216b7715e
ENT-9476: Notary handle timeout can now be passed to driver. (#7302)
* ENT-9476: Notary handle timeout can now be passed to driver.
2023-03-03 17:54:52 +00:00
Ronan Browne
71a7b6f25d
Merge pull request #7285 from corda/connelm/merge-snyk-delta-48-49-2022-12-12
INFRA-1904: Merging forward snyk delta from 4.8 to 4.9 (2022-12-12)
2022-12-12 17:14:07 +00:00
Connel McGovern
cd948b1b5e INFRA-1904: Merging forward snyk delta from 4.8 to 4.9 (2022-12-12) 2022-12-12 16:33:12 +00:00
Ronan Browne
1f705a45e9
Merge pull request #7284 from corda/connelm/merge-snyk-delta-47-48-2022-12-12
INFRA-1904: Merging forward snyk delta from 4.7 to 4.8 (2022-12-12)
2022-12-12 15:47:27 +00:00
Connel McGovern
6e569faf8f INFRA-1904: Merging forward snyk delta from 4.7 to 4.8 (2022-12-12) 2022-12-12 14:40:02 +00:00
Ronan Browne
3a9d6d6b26
Merge pull request #7283 from corda/connelm/merge-snyk-delta-46-47-2022-12-12
INFRA-1904: Merging forward snyk delta from 4.6 to 4.7 (2022-12-12)
2022-12-12 14:36:40 +00:00
Connel McGovern
f256040cee INFRA-1904: Merging forward snyk delta from 4.6 to 4.7 (2022-12-12) 2022-12-12 14:04:50 +00:00
Connel McGovern
d12a6ddc55
INFRA-1904: Enable Snyk Delta on C4 ENT/OS shared pipeline (#7282) 2022-12-12 13:57:40 +00:00
Adel El-Beik
23b872db17
Merge pull request #7275 from corda/parkri/ENT-8817-compute-deadlocks
ENT-8817 OS port of compute deadlock changes
2022-11-25 13:07:19 +00:00
rick.parker
3e25f7fd1a ENT-8817 OS port of compute deadlock changes 2022-11-25 09:31:41 +00:00
Chris Cochrane
0131163db0
ENT-8814 - back-fit changes from Enterprise to OS (#7272) 2022-11-24 18:13:35 +00:00
Rick Parker
188027c1f5
ENT-8811 OS port of flow draining fixes (#7269) 2022-11-24 10:27:00 +00:00
Adel El-Beik
f8f374ec8c
Merge pull request #7268 from corda/cc/merge/os-4.8/os-4.9/16-Nov-2022
ENT-8794 - cc/merge/os 4.8/os 4.9/16 nov 2022
2022-11-17 14:21:58 +00:00
Chris Cochrane
0c4c5bd138
Merge branch 'release/os/4.8' into cc/merge/os-4.8/os-4.9/16-Nov-2022
Fwd-merge from OS 4.8.
2022-11-16 17:35:33 +00:00
Rick Parker
43168387b4
ENT-8794 Delay closing of attachment class loaders (#7267)
* Delay closing of attachment class loaders until all SerializationContext that refer to them (from BasicVerifier) have gone out of scope.

More comments

* Avoid any concurrency issues with queue processing

* Better concurrency behaviour

* Stop re-using attachment URLs as it turns out we can't close the URLClassLoaders when URLs are shared

* Refactor to use a ReferenceQueue.

Co-authored-by: Chris Rankin <chris.rankin@r3.com>
2022-11-15 09:25:54 +00:00
Adel El-Beik
3fd3baa507
Merge pull request #7253 from corda/cc/os/4.9/ent-7034/upgrade_commons_text
ENT-7034 - Upgraded shiro and commons-text to address security issues
2022-10-19 12:48:11 +01:00
Chris Cochrane
0997b49b24
Upgraded shiro and commons-text to address security issues 2022-10-19 10:48:27 +01:00
Jan Szkaradek
19c8dd5cfb
added modules for snyk scanning (#7232) 2022-09-02 14:17:31 +02:00
Jan Szkaradek
cb42ae2980
added modules for snyk scanning (#7233) 2022-09-02 14:17:03 +02:00
Jan Szkaradek
ea9f29e0bd
added modules for snyk scanning (#7234) 2022-09-02 14:16:39 +02:00
Jan Szkaradek
c89ce8e29d
added modules for snyk scanning (#7235) 2022-09-02 14:16:11 +02:00
Chris Cochrane
878f0bba8b
ENT-6885: Added build option to specify the version of Apache commons-configuration2 (#7224)
Added a build.gradle option to specify the version of Apache commons-configuration2 to build with, overriding whatever version is pulled in by Artemis Server.
This is to address Nexus security vulnerability reported for Apache commons-configuration2 v2.7.

This change was previously applied in Ent-4.9 and was shown to remove the critical security issues reported by Nexus. See [PR-4652](https://github.com/corda/enterprise/pull/4562) for more info about that.

The Corda jar was built locally and then scrutinised, revealing that it had Apache commons-configuration2 v2.8.0 included within.
2022-07-29 17:33:13 +01:00
Ronan Browne
24c3e53435
Merge pull request #7222 from corda/add-snyk-scan-4.9
INFRA-1820: add snyk scanning to 4.9
2022-07-28 09:25:09 +02:00
ronanbrowne88
8cf512e6e5 CORE-4769 add snyk scan open source 4.4 2022-07-27 21:41:25 +01:00
ronanbrowne88
8644ab38ff INFRA-1805 add snyk scanning to corda os 4.4 2022-07-27 21:40:44 +01:00
Ronan Browne
aff501fadb
Merge pull request #7221 from corda/add-snyk-scan-4.8
INFRA-1820 Add snyk scan 4.8
2022-07-27 18:41:36 +02:00
ronanbrowne88
d757682291 CORE-4769 add snyk scan open source 4.4 2022-07-27 12:49:53 +01:00
ronanbrowne88
b1afd88f13 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-27 12:48:39 +01:00
Ronan Browne
89a4259c78
Merge pull request #7220 from corda/add-snyk-scan-4.7
INFRA-1805: Add snyk scan 4.7
2022-07-27 13:47:31 +02:00
ronanbrowne88
9425bb5c19 INFRA-1697 minor tidy up 2022-07-26 18:15:01 +01:00
ronanbrowne88
e4a19f4622 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-26 18:11:51 +01:00
Ronan Browne
0b26ffa300
Merge pull request #7219 from corda/add-snyk-scan-4.6
INFRA-1805 Add snyk scan to 4.6 release job
2022-07-26 19:11:05 +02:00
ronanbrowne88
cd577afcd9 CORE-4769 add snyk scan open source 4.4 2022-07-26 16:06:05 +01:00
ronanbrowne88
121e67aa11 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-26 16:06:05 +01:00
Adel El-Beik
ffc843b64d
ENT-6882: Upgraded shiro-core to 1.9.1. (#7217) 2022-07-13 14:40:55 +01:00
Viktor Kolomeyko
c6197bbfaf
ENT-6784: Change Artemis Server logging to WARN (#7215) 2022-07-12 15:06:55 +01:00
nargas-ritu
05c817177a
Merge pull request #7212 from corda/adel/ENT-6847
ENT-6847: Updated shiro and netty version.
2022-06-30 16:31:16 +01:00
Adel El-Beik
c23e8b49d4 ENT-6847: Updated shiro and netty version. 2022-06-30 12:15:31 +01:00
Adel El-Beik
774be6234d
Merge pull request #7208 from corda/hjkim/ent-6714/corda-logs-db-password
ENT-6714: Bugfix - Corda logs database password which controls RPC access
2022-06-24 11:36:24 +01:00
HJ Kim
8d34be5129 ENT-6714: Fix Corda logging database password
This commit ports the previously implemented fix from Corda ENT. Due to
the unrelated changes and merge conflict, the fix has been manually
copied rather than cherry-picked.
2022-06-23 23:03:10 +01:00
Waldemar Żurowski
851bc5506a
Merge pull request #7199 from corda/wz/merge-os-48-49-2022-05-31
NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-31)
2022-05-31 18:06:29 +02:00
Waldemar Zurowski
d149e9792a NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-31) 2022-05-31 15:08:42 +02:00
Waldemar Żurowski
2da94dd92e
Merge pull request #7198 from corda/wz/merge-os-47-48-2022-05-31
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-31)
2022-05-31 14:33:03 +02:00
Waldemar Zurowski
f5f49dbf7c NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-31) 2022-05-31 11:54:52 +02:00
Waldemar Żurowski
3042136743
Merge pull request #7197 from corda/wz/merge-os-46-47-2022-05-31
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31)
2022-05-31 11:52:29 +02:00
Waldemar Zurowski
bc9f7e6513 NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31) 2022-05-31 09:21:29 +02:00