3392 Commits

Author SHA1 Message Date
r3-build
7d416c71d5 Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-05-06 2025-05-06 10:32:46 +00:00
chriscochrane
92326343f0
Updated comment 2025-05-02 10:31:28 +01:00
Chris Cochrane
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
r3-build
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
Chris Cochrane
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
Adel El-Beik
a7750d4b58 ENT-12880: Fixed detekt & and removed proxyIntegrationTest from Jenkins file as target does not exist on OS. 2025-04-11 18:07:00 +01:00
Adel El-Beik
e96bf446d0 ENT-12880: Created new integration test targets to enable builds to go faster (#5364)
* ENT-12880: Created new target integrationTest1 & integrationTest2 to enable builds to go faster.
2025-04-11 17:51:52 +01:00
Adel El-Beik
762d190e94
Merge pull request #7908 from corda/merge-release/os/4.12-release/os/4.13-2025-03-25-16
ENT-12595: Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-03-25
2025-04-01 16:40:09 +01:00
r3-build
190a52212e Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-03-25 2025-03-25 14:35:26 +00:00
Adel El-Beik
c1e0841477
ENT-12595: Missing legacy attachments must also be present in the legacy-contracts folder (#7907)
Some checks failed
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
Ryan Fowler
35543e4a1e Merge fixup 2025-03-24 11:30:15 +00:00
Ryan Fowler
42255b6bd6 Merge fixup 2025-03-17 10:39:45 +00:00
Ryan Fowler
cee8df1bd0 Merge fixup 2025-03-14 13:57:05 +00:00
Ryan Fowler
363876a958 Merge fixup 2025-03-14 11:47:02 +00:00
Ryan Fowler
c9803985e7 Revert "Merge fixup"
This reverts commit c1b718202cb70a9e670cfd66661832dd0e68fc78.
2025-03-14 11:29:33 +00:00
Ryan Fowler
c1b718202c Merge fixup 2025-03-14 10:28:00 +00:00
Rick Parker
91da445d99 ENT-12843: Merge the P2P and RPC built in brokers (#5231)
* Initial look at restricting artemis user based on connection port

* Consolidate RPC and RPCAdmin broker types

* First pass at consolidating into single P2P and RPC broker.  Passes at least one integration test (NodeRPCTests)

* Detekt fixes

* Fix dependencies of BridgeSmokeTest

* Close RPC security manager on shared broker close

* Fix return type from authenticate method to be nullable

* Fix AuthDBTests by stopping caching of RPC users failed logins and now correct permission exception is returned by RPC when user is revoked

* Fix port binding error reporting

* Fix null user to be treated as RPC user, and changed expectation of missing queue to be a permissions failure

* Fix MQSecurityAsRPCTest to have correct expectations

* Fix detekt

* Fix RPCSecurityManagerTest for change in exception thrown

* Added new tests for RPC user deletion and password change

* New RPC test for user password change (old password fails) and reduced caching time of authentication and authorisation, from 1 hour to 10 seconds, of P2P connections now they don't check expensive CRLs.

* Confine max message size checking to P2P port only

* Upgrade to Artemis 2.37.0

* Remove issuance tests as involves no P2P

* Remove issuance tests as involves no P2P

* Upgrade Artemis MQ and Proton-J

* Appease detekt to remove magic numbers

* Fix qpid jms to be a version that is compatible with our code.  No correlation with qpid version.

* Fix deprecated methods

* Revert "Appease detekt to remove magic numbers"

This reverts commit ae7942013ff3ca0f82c71d71177f8037cfeb2d66.

* Revert "Remove issuance tests as involves no P2P"

This reverts commit c5dda17bd8182ecb83dd61bfa9ff658cff114f92.

* Revert "Remove issuance tests as involves no P2P"

This reverts commit 9166541608d12952aa19e8f0c5d0cea2320da9c2.

* Add a constant for qpid version

---------

Co-authored-by: Ryan Fowler <ryan.fowler@r3.com>
2025-03-14 09:57:15 +00:00
Shams Asari
df8f4fa3e9
ENT-12709: Replace uses of assert with correct assertion methods (#7902)
The Kotlin `assert` is only active if the `-ea` JVM flag is specified,
which it isn't. Replaced all uses with the correct assertj assertion.
2025-02-25 14:09:58 +00:00
Adel El-Beik
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
jakub.zadroga
83a7f28c67 Add bcutil dependency for BC 2024-11-21 18:41:24 +07:00
r3-build
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
r3-build
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
Adel El-Beik
4524c6522f ENT-12401: Fixed compilation errors and changed alias from 4.12 variant. 2024-11-06 15:17:23 +00:00
Adel El-Beik
d54f1e2eeb ENT-12373: Can now cope with diff input states from diff rotated CorDapps. 2024-11-06 13:39:32 +00:00
Adel El-Beik
f0c73cc95f ENT-12373: Can now cope with diff input states from diff rotated CorDapps. 2024-11-04 19:44:25 +00:00
Rick Parker
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 4e884a551986e9f499891091a3ff301bb17fc091.

* ENT-12366 Attempt to appease warnings in both 1.2 and 1.9 compilers
2024-11-01 16:27:36 +00:00
Adel El-Beik
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
rick.parker
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
Adel El-Beik
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
Adel El-Beik
98d9263aba ENT-11975: Fixed merge errors. 2024-10-15 17:38:56 +01:00
Adel El-Beik
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
Adel El-Beik
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
Adel El-Beik
828066a646 Backport contract key rotation to 4.9. 2024-10-09 14:46:57 +01:00
rick.parker
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
Adel El-Beik
282ee95188 ENT-11975: Contract key rotation (#7806)
ENT-11975: Contract key rotation implementation.
2024-10-07 16:55:50 +01:00
Adel El-Beik
6f4ec5d9e5
ENT-11975: Contract key rotation (#7806)
ENT-11975: Contract key rotation implementation.
2024-10-02 12:53:11 +01:00
rick.parker
1d8cf545b0 ENT-12072 ENT-12073 Fix merge of NotaryCertificateRotationTest 2024-08-13 17:47:56 +01:00
rick.parker
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
rick.parker
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
Rick Parker
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
Rick Parker
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
Adel El-Beik
4ed675e56d ENT-12008: Upgrade artemis and resolved deprecated methods. 2024-07-17 11:37:43 +01:00
jakub.zadroga
bb91f46fee Add add-opens to fix ENT-11847 2024-06-18 16:42:45 +01:00
jakub.zadroga
a2a89d3f96 Add support for multiple add-opens CLI args to CordaCaplet 2024-06-18 15:32:53 +01:00
Adel El-Beik
8aba2ba35f ENT-11094: Do nothing for paused flows. Matches 4.11. 2024-06-13 17:30:34 +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
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
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
jakub.zadroga
1cd62347f3 Add missing add-opens for sun.security.ec 2024-05-22 14:54:13 +01:00
chriscochrane
5f994fde18
Un-ignored tests for JDK17 2024-05-21 17:08:17 +01:00