Commit Graph

10535 Commits

Author SHA1 Message Date
Adel El-Beik
1261953d82
Merge pull request #7744 from corda/adel/ENT-11892-snappy
ENT-11892: Upgrade Snappy to 0.5
2024-06-11 10:53:51 +01:00
Adel El-Beik
2723e7d408
Merge pull request #7747 from corda/adel/ENT-11113-pt2
ENT-11113, ENT-11903: Ignore the NodeSchedulerPersistenceTest flaky test.
2024-06-11 10:52:55 +01:00
Adel El-Beik
613acb8b94 ENT-11113, ENT-11903: Ignore this flaky test. 2024-06-10 12:52:28 +01:00
Adel El-Beik
a542aa55e6
Merge pull request #7743 from corda/adel/ENT-11113
ENT-11113: Increase timeout from 5 secs in scheduler test, see if sol…
2024-06-06 17:56:30 +01:00
Adel El-Beik
89e9298ba5 ENT-11892: Upgrade Snappy to 0.5 2024-06-06 15:48:58 +01:00
Adel El-Beik
1866a02cf3 ENT-11113: Increase timeout from 5 secs in scheduler test, see if solves intermittent failure on Jenkins. 2024-06-05 16:25:34 +01:00
Adel El-Beik
78bc8e3383
ENT-11343: Dont instrument files starting with jdk as well now. (#7741)
* ENT-11343: Dont instrument files starting with jdk as well now.

* ENT-11343: Keep detekt happy.
2024-06-04 17:55:15 +01:00
Adel El-Beik
da4cce23c3
Merge pull request #7740 from corda/merge-release/os/4.11-release/os/4.12-2024-05-24-250
ES-2371: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-24
2024-05-31 14:27:00 +01:00
Adel El-Beik
42414f3fdd
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-05-24-250 2024-05-30 16:04:09 +01:00
Adel El-Beik
5e82ce02bc
Merge pull request #7738 from corda/adel/ES-2371-revert
ES-2371: Revert h2 data test change. Will be done in separate branch.
2024-05-24 09:33:20 +01:00
Ronan Browne
9947bf549a
Merge pull request #7737 from corda/ronanb/merge-4.11-4.12--2024-05-23
ES-2371: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-23
2024-05-24 08:46:18 +01:00
Adel El-Beik
7209a4e25c ES-2371: Revert h2 data test change. Will be done in separate branch. 2024-05-23 16:07:45 +01:00
Adel El-Beik
d74a6b6fae
Merge pull request #7735 from corda/jzadroga/ent-11858/add-add-opens
ENT-11858: Add missing add-opens for CRAFT4 Archiving CorDapp
2024-05-23 09:32:08 +01:00
Ronan Browne
b4122803ca ES-2371: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-23 2024-05-23 09:13:33 +01:00
Adel El-Beik
07185dfe91
Merge pull request #7732 from corda/cc/dev/os/412/ent-11113/ignored_tests
ENT-11113 - Re-enable ignored tests
2024-05-22 14:55:16 +01:00
jakub.zadroga
1cd62347f3 Add missing add-opens for sun.security.ec 2024-05-22 14:54:13 +01:00
Adel El-Beik
bcc427a9cd
Merge pull request #7731 from corda/ronanb/ES-2371/consume-snapshot-of-h2database
ES-2371: Consume H2 DB snapshot version
2024-05-22 13:51:35 +01:00
chriscochrane
5f994fde18
Un-ignored tests for JDK17 2024-05-21 17:08:17 +01:00
Ronan Browne
4efda6d46b ES-2371: use public mirror 2024-05-13 15:30:01 +01:00
Ronan Browne
204a86d9a6 ES-2371: Update version 2024-05-13 14:17:44 +01:00
Ronan Browne
835e95c222 ES-2371: Consume H2 DB snapshot version 2024-05-12 18:37:43 +01:00
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