r3-build
86dadd5338
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-06-11
2024-06-11 09:54:14 +00:00
r3-build
55f0731b57
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-06-11
2024-06-11 07:20:23 +00:00
r3-build
b443b2c3f9
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-06-10
2024-06-10 14:19:09 +00:00
r3-build
6408ffd065
Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-06-10
2024-06-10 10:29:54 +00:00
Sean Brereton
b608500fe5
ES-2340/Add snyk code ( #7745 )
2024-06-10 11:28:58 +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
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
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
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
Ronan Browne
1f2dea4eb1
ES-2349: update Crons to not run at the weekend
2024-05-01 10:38:19 +01:00
r3-build
a475c275db
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15
2023-12-15 11:41:19 +00:00
r3-build
27759ea74f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-14 17:51:03 +00:00
r3-build
40a96c5760
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:06:04 +00:00
r3-build
0dbdd08984
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895
ENT-11281/Activating forward merge logic
2023-12-14 14:57:13 +00:00
Connel McGovern
2adb502405
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2023-11-20-9
2023-11-21 09:16:06 +00:00
r3-build
5e9fdb7b2b
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 14:29:12 +00:00
Connel McGovern
7c681e025d
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:06:46 +00:00
Connel McGovern
fa899c55c2
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:05:54 +00:00
Ronan Browne
18d98760b1
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2023-11-19-6
2023-11-19 19:56:09 +00:00
Adel El-Beik
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6
2023-11-18 18:10:07 +00:00
Connel McGovern
5b846406c8
ES-1331: Enable Gradle Enterprise build scans & remote caching ( #7574 )
...
* ES-1131: Enable Gradle Enterprise build scans & remote caching
2023-11-17 17:41:45 +00:00
Jose Coll
be433c1fd0
ENT-10100 Filter out UNVERIFIED txns + move TransactionStatus package. ( #7543 )
2023-10-24 17:01:37 +01:00
Jose Coll
6a2bad8077
ENT-10110 Back-port changes from ENT + additional clean-up ( #7532 )
2023-10-17 07:03:49 +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 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 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 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 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 ( #7486 )
...
* 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 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 ( #7484 )
2023-09-07 11:49:33 +02: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
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
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
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
Waldemar Żurowski
267b500c93
updated forward merged to new branch
2023-09-01 11:56:24 +02:00
r3-build
8349675a23
Merging forward updates from release/os/4.6 to release/os/4.7 - 2023-09-01
2023-09-01 09:51:40 +00:00
Waldemar Żurowski
b0f86e26f9
ES-412: added automatic forward merge for Corda 4 ( #7469 )
...
* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
2023-09-01 10:50:47 +01:00
Waldemar Zurowski
849f8666a6
INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8
2023-08-30 16:40:20 +01:00
Waldemar Zurowski
5daa091fdc
INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7
2023-08-30 14:30:31 +01:00
Waldemar Żurowski
00b1f3d2c7
INFRA-1804: revert back to standard agent ( #7463 )
...
* Snyk binaries have been already incorporated into standard Jenkins
agent
2023-08-30 15:28:29 +02:00
Jose Coll
3b78b46619
Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery
2023-08-23 11:20:16 +01:00
Rick Parker
ec261cb0c3
ENT-10306 Swap logic from receive finality to receive transaction flows ( #7451 )
...
* Swap logic from receive finality to receive transaction flows
* Remote TPV check
* Make finality check more robust
* Make emulation of finality in tests compliant with changes
* Improve deferring of ack when issue transaction
* Remove API checking of SignedTransactionWithDistributionList as added it 4.11 so cannot be incompatible, yet.
* Regenerated API file from 4.10 to check only compatibility with 4.10
* Move function to private
* Revert "Regenerated API file from 4.10 to check only compatibility with 4.10"
This reverts commit 6428f957e1
2023-08-23 10:09:42 +01:00
Jose Coll
06e43eb9e2
Fixes following merge.
2023-08-17 08:47:58 +01:00
Shams Asari
e0e4f51ba2
ENT-10285: Remove experimental DJVM support ( #7442 )
2023-08-09 08:44:32 +01:00
