cbfabb6ba1
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2025-05-27-614
2025-05-27 18:52:43 +01:00
2103612e4f
Merging forward updates from release/os/4.10 to release/os/4.11 - 2025-05-23
2025-05-23 11:13:02 +00:00
fc0adadddf
ENT-12884 - Scannable jars improvements ( #7931 )
...
* Better handling of capsule jars for scanning
* Improvements to scannable jar building
2025-05-23 12:11:53 +01:00
92326343f0
Updated comment
2025-05-02 10:31:28 +01:00
2ed57436f5
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2025-04-29-593
2025-05-01 14:07:09 +01:00
14934bc009
Merging forward updates from release/os/4.10 to release/os/4.11 - 2025-04-24
2025-04-24 09:27:51 +00:00
910e6f3212
ENT-12844 - Build default jars for snyk scans ( #7914 )
...
* Build default jars for snyk scans
* Snyk-scanner JAR for corda capsule
* Don't publish snyk-scanner jars
* Unwound previous changes
* Include more snyk-scanner jars; removed references to Snyk
2025-04-24 10:27:04 +01:00
c1e0841477
ENT-12595: Missing legacy attachments must also be present in the legacy-contracts folder ( #7907 )
...
Sync assigned jira issues / sync_assigned (push) Has been cancelled
Sync closed jira issues / sync_closed (push) Has been cancelled
* ENT-12595: Now missing legacy attachments must also be present in the legacy-contracts folder.
* ENT-12595: Updated test to require the missing legacy dependency to be in legacy-contracts folder (or driver equivalent).
2025-03-25 14:34:31 +00:00
7b6df5cc14
ENT-12568: Add ability to pass system properties to external verifier. ( #7897 )
...
* ENT-12568: Add ability to pess system properties to external verifier.
2025-01-15 16:56:32 +00:00
83a7f28c67
Add bcutil dependency for BC
2024-11-21 18:41:24 +07:00
8335dcc931
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-08
2024-11-08 03:33:27 +00:00
78fd46fb1f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-07
2024-11-07 11:08:32 +00:00
4524c6522f
ENT-12401: Fixed compilation errors and changed alias from 4.12 variant.
2024-11-06 15:17:23 +00:00
d54f1e2eeb
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-06 13:39:32 +00:00
f0c73cc95f
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-04 19:44:25 +00:00
436eca1524
ENT-12366 ExternalVerifier no longer needs legacy contracts folder, and can derive everything it needs from attachments. ( #7866 )
...
* ENT-12366 ExternalVerifier no longer needs legacy contracts folder, and can derive everything it needs from attachments.
* ENT-12366 Fix compiler warnings
* Revert "ENT-12366 Fix compiler warnings"
This reverts commit 4e884a5519
2024-11-01 16:27:36 +00:00
8a3ac3882c
Merge pull request #7863 from corda/parkri/legacy-min-platform-version
...
ENT-11479 TransactionBuilder will not add legacy attachments once minimum platform version reaches 140 (4.12)
2024-10-31 14:17:33 +00:00
33592910ee
ENT-11479 TransactionBuilder will not add legacy attachments once minimum platform version reaches 140 (4.12)
2024-10-30 18:05:13 +00:00
33cf48e04b
ENT-12366: External verifier now sets appclassloader to legacy contra… ( #7855 )
...
* ENT-12366: External verifier now sets appclassloader to legacy contracts directory instead of the cordapps directory.
* ENT-12366: Now check legacy-contracts exists before start external verifier.
2024-10-28 15:28:50 +00:00
98d9263aba
ENT-11975: Fixed merge errors.
2024-10-15 17:38:56 +01:00
5b812a56c2
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-10-14-372
2024-10-15 16:33:13 +01:00
3bf717a747
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-10-367
2024-10-14 16:11:30 +01:00
828066a646
Backport contract key rotation to 4.9.
2024-10-09 14:46:57 +01:00
38d7d71a63
ENT-12248 Support for a new legacy-jars directory of 3rd party JARs for the external verifier
2024-10-08 10:09:39 +01:00
282ee95188
ENT-11975: Contract key rotation ( #7806 )
...
ENT-11975: Contract key rotation implementation.
2024-10-07 16:55:50 +01:00
6f4ec5d9e5
ENT-11975: Contract key rotation ( #7806 )
...
ENT-11975: Contract key rotation implementation.
2024-10-02 12:53:11 +01:00
1d8cf545b0
ENT-12072 ENT-12073 Fix merge of NotaryCertificateRotationTest
2024-08-13 17:47:56 +01:00
967402122c
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-08-13-341
...
# Conflicts:
# docker/src/docker/DockerfileAL
# node/src/integration-test/kotlin/net/corda/node/services/identity/NotaryCertificateRotationTest.kt
2024-08-13 17:26:41 +01:00
237d0032ea
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-08-12-297
...
# Conflicts:
# constants.properties
# core-deterministic/build.gradle
# core/src/main/kotlin/net/corda/core/flows/ReceiveTransactionFlow.kt
# serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializePublicKeyTest.kt
2024-08-13 10:22:05 +01:00
ed3875c8b7
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-08-12-297
2024-08-12 19:27:12 +01:00
38f24d33ba
ENT-12072 ENT-12073: Check notary whitelist when resolving old identities and don't depend on network map availability first for old network parameters ( #7781 )
...
Nodes currently will try and resolve network parameters from the network map and fail if it not available, rather than preferring the availability of a node they are currently interacting with.
A migrated notary identity could not be resolved on new nodes added post-migration, but the old identity is available in the network parameter notary whitelist.
Added a test that covers both bugs in a single reproduction test that simulates the scenario in which both were uncovered.
2024-08-12 19:19:30 +01:00
4ed675e56d
ENT-12008: Upgrade artemis and resolved deprecated methods.
2024-07-17 11:37:43 +01:00
bb91f46fee
Add add-opens to fix ENT-11847
2024-06-18 16:42:45 +01:00
a2a89d3f96
Add support for multiple add-opens CLI args to CordaCaplet
2024-06-18 15:32:53 +01:00
8aba2ba35f
ENT-11094: Do nothing for paused flows. Matches 4.11.
2024-06-13 17:30:34 +01:00
613acb8b94
ENT-11113, ENT-11903: Ignore this flaky test.
2024-06-10 12:52:28 +01:00
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
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
1cd62347f3
Add missing add-opens for sun.security.ec
2024-05-22 14:54:13 +01:00
5f994fde18
Un-ignored tests for JDK17
2024-05-21 17:08:17 +01:00
ba71b8606b
ENT-11802: Resolved messages regarding execution optimisations have been disabled.
2024-04-23 11:51:08 +01:00
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
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
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
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
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
d576588676
ENT-11717: Re-enable warnings as errors on Jenkins
2024-03-27 11:21:43 +00:00
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
62819f27f0
ENT-11126: Use UNIX domain socket for communication with external verifier
...
These have the advantage of being more secure as only the current user has access to them and faster than local TCP as it avoids the entire TCP stack.
2024-03-26 11:04:04 +00:00
6e3374c2c8
Merge pull request #7686 from corda/shams-legacy-contract-deps
...
ENT-11445: Support legacy contract CorDapp dependencies
2024-03-20 12:10:35 +00:00
