Commit Graph

10514 Commits

Author SHA1 Message Date
Adel El-Beik
6aed4a8091
Merge pull request #7730 from corda/merge-release/os/4.11-release/os/4.12-2024-05-07-231
ES-2349: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-07
2024-05-07 18:48:03 +01:00
r3-build
79c834d890 Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-07 2024-05-07 09:26:50 +00:00
Shams Asari
2b3c85a468
ENT-11676: Remove logging from debugging session (#7723)
* Remove logging from debugging session

Debugging logging statements leftover from https://github.com/corda/corda/pull/7704.
2024-05-07 10:26:28 +01:00
Adel El-Beik
07a4ac0db8
Merge pull request #7729 from corda/merge-release/os/4.10-release/os/4.11-2024-05-03-185
ES-2349: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-05-03
2024-05-07 10:25:46 +01:00
Adel El-Beik
691f84d46e
Merge pull request #7721 from corda/adel/ENT-11802
ENT-11802: Resolved messages regarding execution optimisations have been disabled.
2024-05-03 14:28:31 +01:00
r3-build
94140605ee Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-05-03 2024-05-03 13:06:50 +00:00
Adel El-Beik
9e5987442c
Merge pull request #7728 from corda/merge-release/os/4.9-release/os/4.10-2024-05-03-192
ES-2349: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-05-03
2024-05-03 14:05:47 +01:00
r3-build
c44f1974b2 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-05-03 2024-05-03 10:04:20 +00:00
Adel El-Beik
4d8515c384
Merge pull request #7726 from corda/merge-release/os/4.8-release/os/4.9-2024-05-01-174
ES-2349: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-05-01
2024-05-03 11:03:19 +01:00
Adel El-Beik
feb522a8ff
Merge pull request #7727 from corda/cc/dev/os/412/netty
ENT-11708,ENT-10958,ENT-10962 - Netty and SSHD upgrades
2024-05-02 16:39:47 +01:00
chriscochrane
35dc65550f
Netty and SSHD upgrades 2024-05-02 11:12:33 +01:00
r3-build
dca0e420c0 Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-05-01 2024-05-01 16:43:39 +00: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
Chris Cochrane
f87f51e660
Dependency updates for security issues (#7722) 2024-04-24 09:03:41 +01:00
Adel El-Beik
ba71b8606b ENT-11802: Resolved messages regarding execution optimisations have been disabled. 2024-04-23 11:51:08 +01:00
Adel El-Beik
275ba7549a
ENT-11722: Check at when load cordapp that the 4.12 cordapp is signed… (#7720)
* ENT-11722: Check at when load cordapp that the 4.12 cordapp is signed by same signers as legacy cordapp.
2024-04-19 17:12:54 +01:00
Shams Asari
18e5f7d68f
ENT-11676: Support for testing backwards compatible transactions in the node driver (#7704)
* ENT-11676: Support for testing backwards compatible transactions in the node driver

* Introduction of a new way to reference CorDapps for the node driver: `TestCordapp.of(URI)`
* New `TestCordapp.asSigned()` method which creates a copy of the CorDapp jar but signed by a dev key.
* Added `NodeParameters.legacyContracts` for specifying legacy contract CorDapps for the node

`TransactionBuilderDriverTest` has been updated to use these new APIs.

* ENT-11676: Support for testing backwards compatible transactions in the node driver

* Introduction of a new way to reference CorDapps for the node driver: `TestCordapp.of(URI)`
* New `TestCordapp.asSigned()` method which creates a copy of the CorDapp jar but signed by a dev key.
* Added `NodeParameters.legacyContracts` for specifying legacy contract CorDapps for the node

`TransactionBuilderDriverTest` has been updated to use these new APIs.

* ENT-11676: Added removed api and fixed alias issue.



---------

Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
2024-04-18 09:41:26 +01:00
Adel El-Beik
0f713aaa44
ENT-11003: Upgraded Jetty and Jersey. (#7715)
* ENT-11003: Upgraded jetty and jersey. Fixed up simm valuation demo.
2024-04-18 09:40:42 +01:00
Adel El-Beik
5b6248de35
Merge pull request #7719 from corda/merge-release/os/4.11-release/os/4.12-2024-04-15-208
ENT-11695: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-04-15
2024-04-15 18:51:59 +01:00
r3-build
7e71d9d205 Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-04-15 2024-04-15 10:34:16 +00:00
Adel El-Beik
615981c638
Merge pull request #7718 from corda/merge-release/os/4.10-release/os/4.11-2024-04-12-163
ENT-11695: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-04-12
2024-04-15 11:32:45 +01:00
r3-build
f7c6669838 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-04-12 2024-04-12 14:36:50 +00:00
Adel El-Beik
468b1eac12
Merge pull request #7717 from corda/merge-release/os/4.9-release/os/4.10-2024-04-12-170
ENT-11695: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-04-12
2024-04-12 15:35:51 +01:00
Chris Cochrane
b969af5ac4
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-04-12-170 2024-04-12 10:57:32 +01:00
Adel El-Beik
66eeb44029
Merge pull request #7716 from corda/cc/dev/os/4.9/security_vulns
ENT-11695,ENT-11696 - Dependency update for security vulns
2024-04-12 10:27:00 +01:00
Chris Cochrane
503d887fd1
Upgrade for security vulns 2024-04-11 14:01:57 +01:00
Ronan Browne
385b7ca4fb
Merge pull request #7714 from corda/merge-release/os/4.11-release/os/4.12-2024-04-09-201
ES-1919: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-04-09
2024-04-09 16:52:01 +01:00
r3-build
b764e17bd2 Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-04-09 2024-04-09 08:50:26 +00:00
Ronan Browne
9aefdc410c
Merge pull request #7713 from corda/merge-release/os/4.10-release/os/4.11-2024-04-08-158
ES-1919: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-04-08
2024-04-09 09:49:35 +01:00
Adel El-Beik
2db7c9656c
ENT-11728: Force use of LTS version of BC everywhere. (#7709)
* ENT-11728: Force use of LTS version of BC everywhere.

* ENT-11728: Removed extra task left in.

* ENT-11728: Revert to the now released 2.73.6 version of BC.
2024-04-08 13:09:34 +01:00
r3-build
3a22520067 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-04-08 2024-04-08 11:42:30 +00:00
Adel El-Beik
82170a6ee1
Merge pull request #7712 from corda/merge-release/os/4.9-release/os/4.10-2024-04-08-165
ES-1919: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-04-08
2024-04-08 12:41:31 +01:00
Ronan Browne
9b393bd58d
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-04-08-165 2024-04-08 09:11:14 +01:00
Ronan Browne
866e30a11d
Merge pull request #7711 from corda/merge-release/os/4.8-release/os/4.9-2024-04-07-149
ES-1919: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-04-07
2024-04-08 09:01:16 +01:00
r3-build
c83c59a374 Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-04-07 2024-04-07 18:39:40 +00: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
9ab1b36128
ENT-11106: Upgrade dependencies Part 1, (jackson, caffeine, guava, je… (#7708)
* ENT-11106: Upgrade dependencies Part 1, (jackson, caffeine, guava, jetty.

* ENT-11106: removed unused import.

* ENT-11106: Fixed the deprecation and null check.
2024-04-03 12:59:34 +01:00
Adel El-Beik
6c4b8fdf23
ENT-11657: Upgrade artemis. (#7707)
* ENT-11657: Upgraded artemis.

* ENT-11657: Reverted dependencies task leftin.

* ENT-11657: Upgraded log4j and slf4j.
2024-04-03 11:15:00 +01:00
Adel El-Beik
72778b7fb0
ENT-11728: Switched to LTS version of BC. Also removed PQC algos as n… (#7706)
* ENT-11728: Switched to LTS version of BC. Also removed PQC algos as not supported in LTS.
* ENT-11728: Removed the SPHINCS PQC algorithm.
* ENT-11728: Added dependency on bcutil to fix missing class error.
2024-04-03 11:14:19 +01:00
Shams Asari
af62c36986
ENT-11458: Make sure external verifier is involved when verifying transactions in collect signatures flow (#7703)
* ENT-11458: Make sure external verifier is involved when verifying transactions in collect signatures flow

* Using SignedTransaction.verify(checkSufficientSignatures = false) after the observation that the current check for notSigned is effectively the same as just calling with checkSufficientSignatures = false.
2024-04-02 16:56:09 +01: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
Adel El-Beik
3ffd77add3
Merge pull request #7702 from corda/shams-enable-warnings-as-errors
ENT-11717: Re-enable warnings as errors on Jenkins
2024-03-28 09:58:21 +00:00
Adel El-Beik
c5cb005eb1
Merge pull request #7701 from corda/shams-fix-byteman-test
ENT-11301: Fixed StateMachineFinalityErrorHandlingTest
2024-03-28 09:56:22 +00:00
Shams Asari
d576588676 ENT-11717: Re-enable warnings as errors on Jenkins 2024-03-27 11:21:43 +00:00
Shams Asari
abed48f0ba ENT-11301: Fixed StateMachineFinalityErrorHandlingTest
Switched to a instrumenting a normal class method since something about interface methods are not working.
2024-03-27 10:48:29 +00:00