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
c2efdc0d52
Merge pull request #7793 from corda/merge-release/os/4.10-release/os/4.11-2024-08-13-301
...
ENT-12080: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-13
2024-08-13 16:43:39 +01:00
rick.parker
137c7fb19a
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-08-13-301
...
# Conflicts:
# tools/checkpoint-agent/build.gradle
2024-08-13 16:38:11 +01:00
Rick Parker
2e63c153d7
Merge pull request #7792 from corda/merge-release/os/4.9-release/os/4.10-2024-08-13-300
...
ENT-12080: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-13
2024-08-13 16:26:40 +01:00
r3-build
5fd8875ed2
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-13
2024-08-13 15:08:09 +00:00
Rick Parker
891164e5d6
Merge pull request #7791 from corda/merge-release/os/4.8-release/os/4.9-2024-08-13-284
...
ENT-12080: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-13
2024-08-13 16:07:21 +01:00
r3-build
b301456bac
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-13
2024-08-13 13:55:03 +00:00
Adel El-Beik
b9dbf5269a
ENT-12080: Replaced jcenter with public local copy. ( #7790 )
2024-08-13 14:54:10 +01:00
Adel El-Beik
c4d3004020
Revert "ENT-12080: Replaces jcenter with local public backup."
...
This reverts commit c5815b0381
2024-08-13 14:15:09 +01:00
Adel El-Beik
c5815b0381
ENT-12080: Replaces jcenter with local public backup.
2024-08-13 14:10:50 +01:00
Rick Parker
cb71455350
Merge pull request #7788 from corda/merge-release/os/4.10-release/os/4.11-2024-08-13-300
...
ES-758: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-13
2024-08-13 10:31:03 +01:00
r3-build
4d619460e1
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-13
2024-08-13 09:28:42 +00:00
Adel El-Beik
80ff76c52c
Merge pull request #7776 from corda/merge-release/os/4.11-release/os/4.12-2024-07-31-321
...
ENT-12039: Merging forward security updates from release/os/4.11 to release/os/4.12 - 2024-07-31
2024-08-13 10:28:12 +01:00
Rick Parker
ccfb8a932d
Merge pull request #7783 from corda/merge-release/os/4.10-release/os/4.11-2024-08-12-297
...
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-12
2024-08-13 10:26:16 +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
Waldemar Żurowski
53d770d8e4
Merge pull request #7787 from corda/merge-release/os/4.9-release/os/4.10-2024-08-13-299
...
ES-758: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-13
2024-08-13 10:01:35 +01:00
r3-build
8dc8062d59
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-13
2024-08-13 08:50:20 +00:00
Waldemar Żurowski
16e7cd4129
Merge pull request #7786 from corda/merge-release/os/4.8-release/os/4.9-2024-08-13-281
...
ES-758: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-13
2024-08-13 09:49:30 +01:00
r3-build
845a940a03
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-13
2024-08-13 08:40:33 +00:00
Waldemar Żurowski
be4664d680
Merge pull request #7785 from corda/merge-release/os/4.7-release/os/4.8-2024-08-13-283
...
ES-758: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-08-13
2024-08-13 09:39:44 +01:00
r3-build
1c6c34fa40
Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-08-13
2024-08-13 08:26:58 +00:00
Waldemar Żurowski
f60074e2b5
ES-758: use remote cache for nightly publishing ( #7784 )
...
* JFrog is shutting down JCenter completely and it is not longer
available
* as very short-term solution switch nightly publishing to R3
Artifactory cache, which already has all necessary binaries downloaded
from JCenter previously
* add missing configuration for Develocity (formerly Gradle Enterprise)
for remote caches
2024-08-13 09:26:00 +01:00
Rick Parker
8bdfbee3f9
Merge pull request #7782 from corda/merge-release/os/4.9-release/os/4.10-2024-08-12-297
...
ENT-12072: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-12
2024-08-12 22:13:55 +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
7e61db7142
ENT-12060: Upgrade artemis to 2.36
2024-08-01 10:21:36 +01:00
Chris Cochrane
08e084a449
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-07-31-321
2024-07-31 13:37:23 +01:00
Adel El-Beik
2223d2808d
Merge pull request #7771 from corda/cc/dev/os/49/security_vulnerabilities
...
ENT-11781 - BouncyCastle update for security issues
2024-07-31 13:21:02 +01:00
Adel El-Beik
847e47f56e
Merge pull request #7772 from corda/cc/dev/os/48/security_vulnerabilities
...
ENT-11889 - Vulnerability updates
2024-07-31 13:20:32 +01:00
Adel El-Beik
eb99c3088d
Merge pull request #7773 from corda/snyk-fix-2e680dae431e26ec29ab098ec605b3fe
...
[Snyk] Security upgrade amazoncorretto from 8u392-al2 to 8u422-al2
2024-07-31 13:19:42 +01:00
Adel El-Beik
df6d23ed80
Merge pull request #7756 from corda/snyk-fix-a389c1cf71fd40130672d30e45891faf
...
[Snyk] Security upgrade urllib3 from 2.0.7 to 2.2.2
2024-07-31 13:18:48 +01:00
Adel El-Beik
b4fb3795c2
Merge branch 'release/os/4.11' into snyk-fix-a389c1cf71fd40130672d30e45891faf
2024-07-31 13:18:37 +01:00
Adel El-Beik
3a51de36be
Merge pull request #7733 from corda/snyk-fix-125125f64edce278ab919b90848c0415
...
[Snyk] Security upgrade requests from 2.31.0 to 2.32.0
2024-07-31 13:17:28 +01:00
Adel El-Beik
33f0d41d82
Merge branch 'release/os/4.11' into snyk-fix-125125f64edce278ab919b90848c0415
2024-07-31 13:17:19 +01:00
Adel El-Beik
36da9f3b67
Merge branch 'release/os/4.11' into snyk-fix-a389c1cf71fd40130672d30e45891faf
2024-07-31 13:16:13 +01:00
Adel El-Beik
d9d391ec95
Merge pull request #7766 from corda/snyk-fix-495bdd4dd785796780d939c7941b26c7
...
[Snyk] Security upgrade setuptools from 40.5.0 to 70.0.0
2024-07-31 13:15:29 +01:00
Adel El-Beik
07722a3ed2
Merge pull request #7775 from corda/merge-release/os/4.10-release/os/4.11-2024-07-31-284
...
ENT-12039,ET-11684,ENT-11683: Merging forward security updates from release/os/4.10 to release/os/4.11 - 2024-07-31
2024-07-31 12:44:02 +01:00
r3-build
d6dd4cebbe
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-07-31
2024-07-31 09:49:49 +00:00
Adel El-Beik
b5575b2f94
Merge pull request #7774 from corda/cc/dev/os/410/security_vulns
...
ENT-12041 - security issues
2024-07-31 10:48:34 +01:00
chriscochrane
9ba25720d8
Upgraded jackson
2024-07-30 16:09:59 +01:00
chriscochrane
e7e4d361f4
Upgraded jackson
2024-07-29 18:08:28 +01:00
chriscochrane
43d0c6a372
Disabled unwanted tests
2024-07-29 14:06:36 +01:00
chriscochrane
67e3b60455
Disabled (rather than ignored) tests
2024-07-29 13:27:23 +01:00
chriscochrane
fb6d409a50
Ignored tests we don't care about
2024-07-29 12:14:11 +01:00
snyk-bot
ca7cf73ceb
fix: docker/src/docker/DockerfileAL to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-AMZN2-CPIO-6371135
- https://snyk.io/vuln/SNYK-AMZN2-GLIBCMINIMALLANGPACK-6745170
- https://snyk.io/vuln/SNYK-AMZN2-LIBNGHTTP2-6745071
- https://snyk.io/vuln/SNYK-AMZN2-NSS-6229002
- https://snyk.io/vuln/SNYK-AMZN2-NSSTOOLS-6229107
2024-07-27 07:20:27 +00:00
chriscochrane
4b90f93f77
Updates for security issues
2024-07-18 14:23:16 +01:00
Adel El-Beik
d6c514c86e
Merge pull request #7770 from corda/adel/ENT-12008-os
...
ENT-12008: Upgrade artemis and resolved deprecated methods.
2024-07-18 08:34:09 +01:00
Adel El-Beik
a08c7139b0
ENT-12008: Fixed deprecated errors.
2024-07-17 13:09:48 +01:00
Adel El-Beik
495a27ca76
ENT-12008: Fixed deprecated methods.
2024-07-17 12:10:28 +01:00
Adel El-Beik
8f103711eb
ENT-12008: Fixed deprecated methods.
2024-07-17 12:02:53 +01:00
