Commit Graph

10176 Commits

Author SHA1 Message Date
Adel El-Beik
b7e484c3d8 ENT-9943: Missed test that had assumed party id was still a long, now updated to string. 2023-09-29 16:14:10 +01:00
Adel El-Beik
3a23f60199
ENT-9943: Now use SecureHash to represent CordaX500Name in distributi… () 2023-09-29 09:03:00 +01:00
Adel El-Beik
aec91c450e
Merge pull request from corda/merge-release/os/4.10-release/os/4.11-2023-09-28-4
ENT-10803: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-28
2023-09-28 12:57:20 +01:00
r3-build
1055ae2b38 Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-28 2023-09-28 08:37:54 +00:00
Chris Cochrane
d1fae19c26
ENT-10803 - Upgraded Jetty () 2023-09-28 09:37:00 +01:00
Rick Parker
1fc4c11361
Merge pull request from corda/merge-release/os/4.9-release/os/4.10-2023-09-27-4
ENT-10806: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-27
2023-09-28 09:36:30 +01:00
Adel El-Beik
ab7bba8846
Merge pull request from corda/cc/dev/os/4.11/security_vulns
ENT-10802 - Security issues
2023-09-27 18:51:20 +01:00
Adel El-Beik
238608224b
ENT-10607: Reduced length of distribution records table name to under… ()
* ENT-10607: Reduced length of distribution records table name to under 30 chars for Oracle.

* ENT-10607: Need to update the entity classes as well.
2023-09-27 14:01:44 +01:00
Chris Cochrane
40539c341b
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2023-09-27-4 2023-09-27 12:22:00 +01:00
Chris Cochrane
6735e4bf36
ENT-10806 - Bumped jetty version () 2023-09-27 11:43:14 +01:00
Chris Cochrane
3b24302045
Bumped Jetty version 2023-09-27 11:27:58 +01:00
Adel El-Beik
2ce63b20a2
Merge pull request from corda/shams-aes-table-remove-primary-key-index
ENT-10811: Removed index on primary key in node_aes_encryption_keys table
2023-09-26 11:00:35 +01:00
Shams Asari
ea4bcd5369 ENT-10811: Removed index on primary key column in node_aes_encryption_keys table
The index is redundant on the primary key, and causes an issue in the schema migration for some databases, such as Oracle.
2023-09-22 15:09:33 +01:00
Balwant Kothari
6243088ebb
ENT-10700 Updating timeWindow to nullable ()
* ENT-10700 Updating timeWindow to nullable
2023-09-21 17:22:27 +01:00
Jose Coll
b16c93e76b
ENT-6875 Deserialisation exception on output state can cause ledger inconsistency () 2023-09-20 08:44:56 +01:00
Rick Parker
a90e0b4cfb
Merge pull request from corda/merge-release/os/4.10-release/os/4.11-2023-09-08-3
ENT-10756 Merging release/os/4.10 to release/os/4.11
2023-09-11 09:41:54 +01:00
r3-build
13e32ae978 Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-08 2023-09-08 16:48:35 +00:00
Waldemar Żurowski
26269b5106
Merge pull request from corda/merge-release/os/4.9-release/os/4.10-2023-09-08-3
ENT-10756 Merging release/os/4.9 to release/os/4.10
2023-09-08 17:47:32 +01:00
Waldemar Żurowski
f66c270fc6
Merge pull request from corda/wzur-r3/ES-1313/merge/release/os/4.10/with/release/os/4.11/2023-09-08
ES-1313: Merging forward updates from release/os/4.10 to release/os/4.11
2023-09-08 16:37:18 +01:00
r3-build
17f5cd5524 Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-08 2023-09-08 14:56:56 +00:00
Shams Asari
fb4247d5c9
ENT-10756: Use normal select count query for totalStatesAvailable ()
Some DBs do not like the use of `distinct` in the count query for the `Page.totalStatesAvailable` result. It turns out it's not needed anyway and a non-distinct select count works as well.
2023-09-08 15:55:23 +01:00
Waldemar Zurowski
7175d56f6c ES-1313: Merging forward updates from release/os/4.10 to release/os/4.11
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-08 09:09:58 +01:00
Waldemar Żurowski
c75fac4801
Merge pull request from corda/wzur-r3/ES-1313/merge/release/os/4.9/with/release/os/4.10/2023-09-07
ES-1313: Merging forward updates from release/os/4.9 to release/os/4.10
2023-09-08 07:52:38 +01:00
Waldemar Zurowski
9f395b5ec3 ES-1313: Merging forward updates from release/os/4.9 to release/os/4.10
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 20:36:14 +01:00
Waldemar Żurowski
fad7fcbd11
Merge pull request from corda/wzur-r3/ES-1313/merge/release/os/4.8/with/release/os/4.9/2023-09-07
ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9
2023-09-07 20:30:55 +01:00
Waldemar Zurowski
a7274c4ec2 ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 18:30:28 +01:00
Waldemar Żurowski
8dd436ebc9
Merge pull request from corda/wzur-r3/ES-1313/merge/release/os/4.7/with/release/os/4.8/2023-09-07
ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8
2023-09-07 18:21:55 +01:00
Waldemar Zurowski
fd55e4c8d4 ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 16:08:20 +01:00
Waldemar Żurowski
bae84b3c63
Merge pull request from corda/wzur-r3/ES-1313/merge/release/os/4.6/with/release/os/4.7/2023-09-07
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
2023-09-07 16:05:51 +01:00
Waldemar Zurowski
1c903b0ff2 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 14:06:10 +01:00
Waldemar Żurowski
dfe0ed294e
ES-1313: changes for better future forward merges ()
* add more comments as a form of documentation
* move variable names away from calling pipeline for better experience
of future forward merges if pipeline parameters were to change
2023-09-07 14:39:02 +02:00
Waldemar Żurowski
ddcb8adfc0
Merge pull request from corda/wzur-r3/ES-1313/merge/release/os/4.6/with/release/os/4.7/2023-09-07
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
2023-09-07 13:34:34 +01:00
Waldemar Zurowski
658e7217a3 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
Conflicts:

* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 11:27:57 +01:00
Ronan Browne
8e2115293a
ES-1313: Update Jenkinsfile for slack channel () 2023-09-07 11:49:33 +02:00
Rick Parker
5d84d0a5c9
ENT-10306 Missed actually verifying transaction from recent refactor () 2023-09-06 16:32:47 +01:00
Rick Parker
615464e0c7
Merge pull request from corda/merge-release/os/4.10-release/os/4.11-2023-09-04-1
ES-412 Merging release/os/4.10 to release/os/4.11
2023-09-04 14:46:11 +01:00
Adel El-Beik
517884a96e
Merge pull request from corda/adel/ENT-10693-os
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow…
2023-09-04 12:47:00 +01:00
Waldemar Żurowski
d7a5428665
Updated for new branch 2023-09-04 12:08:52 +01:00
r3-build
33798df51d Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-04 2023-09-04 10:21:44 +00:00
Rick Parker
694b011492
Merge pull request from corda/merge-release/os/4.9-release/os/4.10-2023-09-01-1
ES-412 Merging release/os/4.9 to release/os/4.10
2023-09-04 11:20:31 +01:00
Waldemar Żurowski
8a01b25684
updated forward merger for current branch
* updated originBranch to match current branch
* updated targetBranch to match branch with the next version
19:11
2023-09-01 22:50:29 +02:00
r3-build
612cfcdb32 Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-01 2023-09-01 20:47:47 +00:00
Waldemar Żurowski
8fb5308194
Merge pull request from corda/merge-release/os/4.8-release/os/4.9-2023-09-01-1
ES-412 Merging release/os/4.8 to release/os/4.9
2023-09-01 21:43:39 +01:00
Waldemar Żurowski
3a093ef324
updated forward merged to new branch 2023-09-01 18:25:46 +02:00
r3-build
313d342b02 Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-09-01 2023-09-01 16:23:11 +00:00
Waldemar Żurowski
5ff4b4e8f6
Merge pull request from corda/merge-release/os/4.7-release/os/4.8-2023-09-01-1
ES-412 Merging release/os/4.7 to release/os/4.8
2023-09-01 17:22:13 +01:00
Adel El-Beik
dc51f10832 ENT-10694: Switch the noisy SSL handshake to trace logging. But allow it to be enabled again with a system property. 2023-09-01 14:48:56 +01:00
Adel El-Beik
fb7e7057de
Merge pull request from corda/adel/ENT-10694-os
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow…
2023-09-01 14:39:50 +01:00
Waldemar Żurowski
3d8636c716
updated for new branch 2023-09-01 14:55:04 +02:00
r3-build
fe9483d331 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-09-01 2023-09-01 12:47:45 +00:00