Adel El-Beik
aa865aa98a
Merge pull request #7930 from corda/merge-release/os/4.12-release/os/4.13-2025-05-06-48
...
ENT-12844: Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-05-06
2025-05-06 18:47:35 +01:00
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
Adel El-Beik
0913b95423
Merge pull request #7928 from corda/merge-release/os/4.11-release/os/4.12-2025-04-29-593
...
Sync assigned jira issues / sync_assigned (push) Has been cancelled
Sync closed jira issues / sync_closed (push) Has been cancelled
ENT-12844: Merging forward updates from release/os/4.11 to release/os/4.12 - 2025-04-29
2025-05-06 11:32:01 +01:00
chriscochrane
92326343f0
Updated comment
2025-05-02 10:31:28 +01:00
chriscochrane
7644bcc3f3
Fwd-merged changes from 4.11
2025-05-01 17:11:15 +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
Adel El-Beik
3b8aa3a743
Merge pull request #7925 from corda/merge-release/os/4.10-release/os/4.11-2025-04-24-546
...
ENT-12844: Merging forward updates from release/os/4.10 to release/os/4.11 - 2025-04-24
2025-04-28 16:59:33 +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
Connel McGovern
1b3e8408a4
Merge pull request #7924 from corda/merge-release/os/4.12-release/os/4.13-2025-04-23-38
...
ES-2710: Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-04-23
2025-04-24 09:42:34 +01:00
r3-build
50e6c7b980
Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-04-23
2025-04-23 09:49:41 +00:00
Connel McGovern
d853eb9c6d
Merge pull request #7923 from corda/merge-release/os/4.11-release/os/4.12-2025-04-22-587
...
Sync closed jira issues / sync_closed (push) Has been cancelled
Sync assigned jira issues / sync_assigned (push) Has been cancelled
ES-2710: Merging forward updates from release/os/4.11 to release/os/4.12 - 2025-04-22
2025-04-23 10:48:57 +01:00
Connel McGovern
9377364031
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2025-04-22-587
2025-04-22 15:03:29 +01:00
Connel McGovern
0c337aeda5
Merge pull request #7922 from corda/merge-release/os/4.10-release/os/4.11-2025-04-22-543
...
ES-2710: Merging forward updates from release/os/4.10 to release/os/4.11 - 2025-04-22
2025-04-22 14:46:09 +01:00
Ronan Browne
b75e694653
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2025-04-22-543
2025-04-22 09:57:04 +01:00
Connel McGovern
66c44adc16
Merge pull request #7919 from corda/connelm/disable-synk-delta-feature-branch-4-10
...
ES-2710: PR Code Checks only run Snyk Delta on PR's targeting release branch
2025-04-22 09:47:21 +01:00
Connel McGovern
136503086a
Update pr-code-check to only run Snyk Delta on branches targeting release branch
2025-04-18 13:50:17 +01:00
Adel El-Beik
9b68056539
Merge pull request #7916 from corda/adel/ENT-12880-os-pt2
...
ENT-12880: Update Jenkins file to speed up build and to match PR Jenkins file.
2025-04-15 16:13:17 +01:00
Adel El-Beik
cd89a4c9bb
ENT-12880: Update Jenkins file to speed up build and to match PR Jenkins file.
2025-04-15 16:04:34 +01:00
Adel El-Beik
8de03f9bf8
Merge pull request #7915 from corda/adel/ENT-12880-os
...
ENT-12880: Created new integration test targets to enable builds to go faster
2025-04-14 17:08:55 +01:00
Adel El-Beik
693232aa5c
ENT-12880: Removed duplicate slow integration test.
2025-04-14 12:06:43 +01:00
Adel El-Beik
ea1eaafad7
ENT-12880: Removed the duplicate smoke test.
2025-04-14 11:55:10 +01:00
Adel El-Beik
4aab01cd8f
ENT-12880: Changed position of authenticateGradleWrapper()
2025-04-14 10:07:13 +01:00
Adel El-Beik
741f69e940
ENT-12880: Added authenticationGradleWrapper() call on recompile.
2025-04-14 09:20:36 +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
Adel El-Beik
b6c9123262
Merge pull request #7909 from corda/adel/ENT-12855-pt3
...
ENT-12855: Upped platform version to 150.
2025-04-01 16:37:55 +01:00
Adel El-Beik
12052c3f7f
Merge pull request #7906 from corda/ENT-12852-port-single-broker
...
ENT-12852-port-single-broker
2025-03-27 12:44:25 +00:00
Adel El-Beik
93598ab798
ENT-12855: Upped platform version to 150.
2025-03-26 15:11:30 +00: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 )
...
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
Adel El-Beik
40cee6cc75
Merge pull request #7905 from corda/adel/ENT-12855
...
ENT-12855: Moved the build version to 4.13 and upped platform version…
2025-03-19 10:40:50 +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
Adel El-Beik
fc1764dcd5
ENT-12855: Moved the build version to 4.13 and upped platform version to 141.
2025-03-13 14:29:38 +00:00
Adel El-Beik
4dd3857592
Merge pull request #7903 from corda/merge-release/os/4.12-release/os/4.13-2025-03-05-1
...
ENT-12508: Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-03-05
2025-03-12 10:44:18 +00:00
r3-build
3a2b3ae5a7
Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-03-05
2025-03-05 17:00:08 +00:00
Chris Cochrane
fe770cdc0d
ENT-12508 - Upgraded Log4j ( #7896 )
...
Sync assigned jira issues / sync_assigned (push) Has been cancelled
Sync closed jira issues / sync_closed (push) Has been cancelled
* Upgraded Log4j; removed superfluous code
* Removed unused imports
2025-03-03 15:43:00 +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
781aaba649
ENT-12568: Added a test to check system property is defined in external verifier. ( #7898 )
2025-01-22 18:00:25 +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
Chris Cochrane
1c40e969f7
ENT-12507 - Revert Log4j ( #7895 )
...
* Rollback log4j
* Revert Log4j further
2024-12-13 09:32:00 +00:00
Chris Cochrane
40ce095398
ENT-12507 - Upgrade log4j ( #7894 )
...
* Upgrade log4j
* Added deprecation suppressions
2024-12-11 13:02:01 +00:00
Chris Cochrane
80c416f8e2
ENT-12321,ENT-12322,ENT-12425 - Dependency updates ( #7892 )
...
* Dependency updates
* Removed superfluous force-override
---------
Co-authored-by: Adel El-Beik <48713346+adelel1@users.noreply.github.com>
2024-12-09 13:38:09 +00:00
