ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-25 07:31:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,778 Commits 91 Branches 405 Tags 354 MiB
2e724cb82f
Commit Graph

9778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viktor Kolomeyko
6d0875076f
Merge pull request #7225 from corda/cc/merge/os-4.9/os-4.10/01-Aug-2022 
ENT-6885 - cc/merge/os 4.9/os 4.10/01 aug 2022
 2022-08-01 17:43:54 +01:00
Chris Cochrane
877e00f8d3
Fwd-merge from OS-4.9 2022-08-01 13:00:57 +01: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
f9b8af85c2
Merge pull request #7223 from corda/add-snyk-scan-4.10 
INFRA-1805 Add snyk scan 4.10
 2022-07-29 17:43:34 +02:00
ronanbrowne88
212cd2214c CORE-4769 add snyk scan open source 4.4 2022-07-29 09:30:16 +01:00
ronanbrowne88
cc929e3b5b INFRA-1805 add snyk scanning to corda os 4.4 2022-07-29 09:25:32 +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
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
Chris Cochrane
54fdd12a2d
ENT-6866 support quick RPCs that are not processed via the RPC thread pool (#7213) 
* ENT-6866 support quick RPCs that are not processed via the RPC thread pool
 2022-07-07 12:33:51 +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
ac6bac5a87
Merge pull request #7210 from corda/hjkim/os-4.9-4.10-merge-24062022 
ENT-6714: Merge OS 4.9 to 4.10
 2022-06-27 12:35:30 +01:00
HJ Kim
0a59d578ff Merge branch 'release/os/4.9' into hjkim/os-4.9-4.10-merge-24062022 
This merge includes a bugfix ENT-6714 which Corda logs database
password.
 2022-06-24 16:08:16 +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
Adel El-Beik
0f739a29ec
Merge pull request #7207 from corda/cc/os/4.10/ENT-6863/upgrade_netty 
ENT-6863 upgrade netty to 4.1.77.Final
 2022-06-22 19:05:05 +01:00
Chris Cochrane
3d52a67ded
ENT-6863 upgrade netty to 4.1.77.Final 2022-06-22 16:20:03 +01:00
Adel El-Beik
c98923d008
Merge pull request #7202 from corda/peterli-r3-patch-2 
NOTICK: Update README
 2022-06-17 14:18:22 +01:00
Adel El-Beik
b50d06945f
Merge pull request #7203 from corda/cc/notick/corda_service_event_priority_test 
NOTICK - Added integration tests for service event priorities
 2022-06-15 16:34:19 +01:00
Chris Cochrane
199f635d69
Attempt to fix service priority tests when they are run on Jenkins 2022-06-15 11:56:03 +01:00
Chris Cochrane
c57bbd1c39
Added integration tests for service event priorities 2022-06-14 17:15:31 +01:00
peterli-r3
491d37e2b1
Update README.md 2022-06-13 16:53:12 +08:00
Chris Cochrane
03fa529292
ENT-6791 New service lifecycle event published just before starting the state machine (#7164) 2022-06-10 19:56:02 +01:00
Adel El-Beik
cd1e3bab85
Merge pull request #7201 from corda/cc/ENT-6854/node_status_jmx 
ENT-6854 - node status published via JMX
 2022-06-09 16:44:20 +01:00
Chris Cochrane
f0d530ab8b
Post review updates; renamed tests/files, neater Kotlin test code 2022-06-08 16:30:06 +01:00
Chris Cochrane
4b1aabb164
Update node/src/integration-test/kotlin/net/corda/node/jmx/NodeStatus.kt 
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
 2022-06-08 16:01:43 +01:00
Chris Cochrane
0232146515
Update node/src/integration-test/kotlin/net/corda/node/jmx/Publish.kt 
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
 2022-06-08 16:01:25 +01:00
Chris Cochrane
3c0c1a01a2
Update node/src/integration-test/kotlin/net/corda/node/jmx/Publish.kt 
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
 2022-06-08 15:50:48 +01:00
Chris Cochrane
fce95dd276
Update node/src/integration-test/kotlin/net/corda/node/jmx/NodeStatus.kt 
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
 2022-06-08 15:50:34 +01:00
Chris Cochrane
518befabeb
Resolved detekt error 2022-06-08 13:54:16 +01:00
Chris Cochrane
500be9cbcd
Post-review updates; added integration tests 2022-06-08 13:36:50 +01:00
Chris Cochrane
b76fc7de59
Introduced node status; published via JMX 2022-06-07 16:20:05 +01:00
Waldemar Żurowski
6252217bb6
Merge pull request #7200 from corda/wz/merge-os-49-410-2022-05-31 
NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-31)
 2022-06-01 08:07:10 +02:00
Waldemar Zurowski
ac60c66b2f NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-31) 2022-05-31 18:07:40 +02: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
Waldemar Żurowski
1baedbeb7c
Merge pull request #7196 from corda/wz/merge-os-45-46-2022-05-30 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30)
 2022-05-31 09:18:57 +02:00
Waldemar Zurowski
911f033e42 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30) 2022-05-30 18:08:16 +02:00
Waldemar Żurowski
8d110c1691
Merge pull request #7195 from corda/wz/merge-os-44-45-2022-05-30 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30)
 2022-05-30 18:07:38 +02:00
Waldemar Zurowski
142b7d3fd0 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30) 2022-05-30 14:49:32 +02:00