Commit Graph

10564 Commits

Author SHA1 Message Date
tomstark99
77fe5fc206 removed custom command 2024-06-19 11:08:13 +01:00
tomstark99
e722919885 added field import 2024-06-18 17:56:01 +01:00
tomstark99
6f56196df0 changed to static class 2024-06-18 17:50:38 +01:00
tomstark99
e7ede512e7 updated pipeline and plugin version 2024-06-18 17:45:23 +01:00
tomstark99
a678d0c7d1 Merge branch 'release/os/4.12' into tom/ENT-11104 2024-06-17 14:21:24 +01:00
tomstark99
49b24e9989 updated pipeline steps again 2024-06-14 15:37:46 +01:00
tomstark99
f6d6dbb5e3 updated pipeline steps 2024-06-14 15:00:14 +01:00
tomstark99
67f7660669 updated jenkins stage slightly 2024-06-14 13:39:38 +01:00
tomstark99
507fe2ade1 updated api-current file 2024-06-14 13:37:51 +01:00
Adel El-Beik
5be80254e8
Merge pull request #7753 from corda/adel/ENT-11094
ENT-11094: Do nothing for paused flows. Matches 4.11.
2024-06-14 11:24:31 +01:00
tomstark99
3b1d64a8ac added new api-scanner 2024-06-13 19:44:31 +01:00
Adel El-Beik
8aba2ba35f ENT-11094: Do nothing for paused flows. Matches 4.11. 2024-06-13 17:30:34 +01:00
Ronan Browne
863cc9bf3d
Merge pull request #7752 from corda/merge-release/os/4.11-release/os/4.12-2024-06-11-269
ES-2340: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-06-11
2024-06-12 07:50:30 +01:00
Adel El-Beik
87c236c17a
Merge pull request #7751 from corda/adel/ENT-11008-pt2
ENT-11008: Upgrade to Gradle 7.6.4.
2024-06-12 01:45:52 +01:00
r3-build
2a5d0d7ea4 Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-06-11 2024-06-11 18:04:20 +00:00
Adel El-Beik
318990cfd9
Merge pull request #7750 from corda/merge-release/os/4.10-release/os/4.11-2024-06-11-225
ES-2340: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-06-11
2024-06-11 19:02:56 +01:00
Adel El-Beik
71865b3a34 ENT-11008: Upgrade to Gradle 7.6.4. 2024-06-11 16:45:32 +01:00
Adel El-Beik
8b08f21fb1 ENT-11008: Upgrade to Gradle 7.6.4. 2024-06-11 16:39:57 +01:00
Adel El-Beik
bc72147c33
Merge pull request #7742 from corda/adel/ENT-11008-os
ENT-11008: Upgrade gradle to 7.6.2.
2024-06-11 10:54:19 +01:00
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
Adel El-Beik
1261953d82
Merge pull request #7744 from corda/adel/ENT-11892-snappy
ENT-11892: Upgrade Snappy to 0.5
2024-06-11 10:53:51 +01:00
Adel El-Beik
625cf82821
Merge pull request #7749 from corda/merge-release/os/4.9-release/os/4.10-2024-06-11-232
ES-2340: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-06-11
2024-06-11 10:53:18 +01:00
Adel El-Beik
2723e7d408
Merge pull request #7747 from corda/adel/ENT-11113-pt2
ENT-11113, ENT-11903: Ignore the NodeSchedulerPersistenceTest flaky test.
2024-06-11 10:52:55 +01: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
Waldemar Żurowski
48e385a9a2
Merge pull request #7748 from corda/merge-release/os/4.8-release/os/4.9-2024-06-10-215
ES-2340: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-06-10
2024-06-11 08:18:58 +01: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
Sean Brereton
729883555f
Merge pull request #7746 from corda/merge-release/os/4.7-release/os/4.8-2024-06-10-218
ES-2340: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-06-10
2024-06-10 15:18:23 +01:00
Adel El-Beik
613acb8b94 ENT-11113, ENT-11903: Ignore this flaky test. 2024-06-10 12:52:28 +01: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
Adel El-Beik
748aa7b2c0 Merge branch 'release/os/4.12' into adel/ENT-11008-os 2024-06-06 17:57:46 +01:00
Adel El-Beik
a542aa55e6
Merge pull request #7743 from corda/adel/ENT-11113
ENT-11113: Increase timeout from 5 secs in scheduler test, see if sol…
2024-06-06 17:56:30 +01:00
Adel El-Beik
89e9298ba5 ENT-11892: Upgrade Snappy to 0.5 2024-06-06 15:48:58 +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
78bc8e3383
ENT-11343: Dont instrument files starting with jdk as well now. (#7741)
* ENT-11343: Dont instrument files starting with jdk as well now.

* ENT-11343: Keep detekt happy.
2024-06-04 17:55:15 +01:00
Adel El-Beik
c8c8a8fa2b ENT-11008: Upgrade gradle to 7.6.2. 2024-06-04 16:41:42 +01:00
Adel El-Beik
da4cce23c3
Merge pull request #7740 from corda/merge-release/os/4.11-release/os/4.12-2024-05-24-250
ES-2371: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-24
2024-05-31 14:27:00 +01:00
Adel El-Beik
42414f3fdd
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-05-24-250 2024-05-30 16:04:09 +01:00
Adel El-Beik
5e82ce02bc
Merge pull request #7738 from corda/adel/ES-2371-revert
ES-2371: Revert h2 data test change. Will be done in separate branch.
2024-05-24 09:33:20 +01:00
Ronan Browne
9947bf549a
Merge pull request #7737 from corda/ronanb/merge-4.11-4.12--2024-05-23
ES-2371: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-23
2024-05-24 08:46:18 +01:00
Adel El-Beik
7209a4e25c ES-2371: Revert h2 data test change. Will be done in separate branch. 2024-05-23 16:07:45 +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
Ronan Browne
b4122803ca ES-2371: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-05-23 2024-05-23 09:13:33 +01:00
Adel El-Beik
07185dfe91
Merge pull request #7732 from corda/cc/dev/os/412/ent-11113/ignored_tests
ENT-11113 - Re-enable ignored tests
2024-05-22 14:55:16 +01:00
jakub.zadroga
1cd62347f3 Add missing add-opens for sun.security.ec 2024-05-22 14:54:13 +01:00
Adel El-Beik
bcc427a9cd
Merge pull request #7731 from corda/ronanb/ES-2371/consume-snapshot-of-h2database
ES-2371: Consume H2 DB snapshot version
2024-05-22 13:51:35 +01:00
chriscochrane
5f994fde18
Un-ignored tests for JDK17 2024-05-21 17:08:17 +01:00
Ronan Browne
4efda6d46b ES-2371: use public mirror 2024-05-13 15:30:01 +01:00
Ronan Browne
204a86d9a6 ES-2371: Update version 2024-05-13 14:17:44 +01:00
Ronan Browne
835e95c222 ES-2371: Consume H2 DB snapshot version 2024-05-12 18:37:43 +01:00