ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 00:38:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,966 Commits 91 Branches 405 Tags 354 MiB
602190095c
Commit Graph

9966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Waldemar Żurowski
6a3e6276a4
CORE-4784: remove obsolete check when generating NexusIQ reports (#7194) 
* do not use `isReleasePatch` when deciding if NexusIQ reports should be
  created. That is not available after 4.8 branch and reports should be
  generated for the patched releases in the first place.
 2022-05-30 13:57:13 +02:00
Waldemar Żurowski
043c4e5dcc
NOTICK: remove obsolete parameter (#7193) 
* removed `project` parameter from `jira-sync-closed-action` as it was never used
 2022-05-30 10:57:04 +02:00
Waldemar Żurowski
9818d3beac
Merge pull request #7192 from corda/wz/merge-os-49-410-2022-05-26 
NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-26)
 2022-05-27 11:56:06 +02:00
Waldemar Zurowski
206f3ac088 Added missing update of Jackson version 2022-05-27 09:22:29 +02:00
Waldemar Zurowski
9d3548d36e NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-26) 
Conflicts:
* build.gradle
 2022-05-26 20:21:53 +02:00
Waldemar Żurowski
11113d262c
Merge pull request #7191 from corda/wz/merge-os-48-49-2022-05-26 
NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-26)
 2022-05-26 20:15:57 +02:00
Waldemar Zurowski
031eb263e6 NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-26) 
Conflicts:
* constants.properties
 2022-05-26 16:38:00 +02:00
Waldemar Żurowski
0c8d685fbd
Merge pull request #7190 from corda/wz/merge-os-47-48-2022-05-26 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26)
 2022-05-26 16:33:17 +02:00
Ronan Browne
a830b3707c
Merge pull request #7189 from corda/ronanb/INFRA-1697/remove-credentals-4.8 
INFRA-1697 ensure we authenticate gradle creds on agent 2
 2022-05-26 14:16:55 +01:00
Waldemar Zurowski
ec14f9ccba NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26) 2022-05-26 14:13:33 +02:00
Waldemar Żurowski
d6eceed2df
Merge pull request #7188 from corda/wz/merge-os-46-47-2022-05-25 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-25)
 2022-05-26 14:10:24 +02:00
Ronan Browne
ab5f4fe0a4
INFRA-1697 authenticate on agent 2 2022-05-26 12:06:47 +01:00