Commit Graph

9885 Commits

Author SHA1 Message Date
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
Ronan Browne
59775837a1
Merge pull request #7216 from corda/add-snyk-scan-4.5
INFRA-1805: Add snyk scan to 4.5 OS stream
2022-07-12 18:44:32 +02:00
Viktor Kolomeyko
c6197bbfaf
ENT-6784: Change Artemis Server logging to WARN (#7215) 2022-07-12 15:06:55 +01:00
ronanbrowne88
12bbf98de2 CORE-4769 add snyk scan open source 4.5 2022-07-12 13:06:02 +01:00
Ronan Browne
1b18f793ec
Merge pull request #7214 from corda/add-snyk-scan-4.4
INFRA-1805: Add snyk scan to 4.4 OS stream
2022-07-12 14:03:02 +02:00
ronanbrowne88
e35b755546 CORE-4769 add snyk scan open source 4.4 2022-07-11 22:01:25 +01:00
ronanbrowne88
d669d39e64 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-10 19:33:37 +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
0d98426310
Merge pull request #7211 from corda/adel/ENT-6865
ENT-6865: Bumped quasar version for compatibility with ENT.
2022-06-28 18:00:06 +01:00
Adel El-Beik
000019b65c ENT-6865: Bumped quasar version for compatibility with ENT. 2022-06-28 10:48:27 +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
a78ad86c61
Merge pull request #7206 from corda/adel/ENT-6858-com
ENT-6858: Updated bouncy castle to 1.68 to match 4.5.
2022-06-23 11:00:35 +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
872a81617a ENT-6858: Updated bouncy castle to 1.68 to match 4.5. 2022-06-22 14:35:54 +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
b56be89fb1
Merge pull request #7205 from corda/adel/ENT-6858
ENT-6858: In our Corda BC provider add support for Signature.Ed25519
2022-06-17 14:02:03 +01:00
Adel El-Beik
aa0963bc76 ENT-6858: In our Corda BC provider add support for Signature.Ed25519 using our own X509EdDSAEngine. Needed so that we can upgrade BC in ENT. 2022-06-16 18:01:32 +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