Adel El-Beik
d578cae797
Merge pull request #7805 from corda/merge-release/os/4.11-release/os/4.12-2024-08-15-346
...
ENT-12108: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-15
2024-08-15 10:36:19 +01:00
r3-build
5a94803222
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-15
2024-08-15 06:08:14 +00:00
Rick Parker
cc44c77ed4
ENT-12108 ReceiveFinalityFlow returns a transaction that is not signed by the notary ( #7804 )
2024-08-15 07:06:58 +01:00
Adel El-Beik
454ae72905
Merge pull request #7803 from corda/merge-release/os/4.11-release/os/4.12-2024-08-14-344
...
ENT-12093: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-14
2024-08-14 16:15:26 +01:00
r3-build
a1c1e722bc
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-14
2024-08-14 14:56:26 +00:00
Adel El-Beik
d888dea3c2
Merge pull request #7802 from corda/merge-release/os/4.10-release/os/4.11-2024-08-14-304
...
ENT-12093: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14
2024-08-14 15:55:42 +01:00
r3-build
680da7791f
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14
2024-08-14 14:54:44 +00:00
Adel El-Beik
af27b60917
Merge pull request #7801 from corda/merge-release/os/4.9-release/os/4.10-2024-08-14-303
...
ENT-12093: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14
2024-08-14 15:53:59 +01:00
r3-build
7f4977a111
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14
2024-08-14 14:52:13 +00:00
Adel El-Beik
1f598f9d68
Merge pull request #7800 from corda/merge-release/os/4.8-release/os/4.9-2024-08-14-286
...
ENT-12093: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-14
2024-08-14 15:51:27 +01:00
Adel El-Beik
8cfa851d86
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2024-08-14-286
2024-08-14 15:48:45 +01:00
Adel El-Beik
f9599ed349
ENT-12093: Updated BC api docs url. ( #7799 )
2024-08-14 15:43:35 +01:00
Adel El-Beik
04c3642695
Merge pull request #7798 from corda/merge-release/os/4.11-release/os/4.12-2024-08-14-343
...
ENT-12093: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-14
2024-08-14 15:37:56 +01:00
Adel El-Beik
9075bac696
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-08-14-343
2024-08-14 13:54:47 +01:00
Adel El-Beik
b875a074fc
Merge pull request #7797 from corda/merge-release/os/4.10-release/os/4.11-2024-08-14-303
...
ENT-12093: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14
2024-08-14 12:06:52 +01:00
r3-build
dce854fa89
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14
2024-08-14 10:15:00 +00:00
Adel El-Beik
b7db5ad109
Merge pull request #7796 from corda/merge-release/os/4.9-release/os/4.10-2024-08-14-302
...
ENT-12093: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14
2024-08-14 11:14:05 +01:00
r3-build
0cc464fe51
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14
2024-08-14 09:29:33 +00:00
Adel El-Beik
d56016f8a7
ENT-12093: Updated with correct links for BC. ( #7795 )
2024-08-14 10:28:13 +01:00
Rick Parker
8bca04ac12
Merge pull request #7794 from corda/merge-release/os/4.11-release/os/4.12-2024-08-13-341
...
ENT-12080: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-13
2024-08-13 18:25:40 +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
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
snyk-bot
bd901b5121
fix: release-tools/testing/requirements.txt to reduce vulnerabilities
...
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-REQUESTS-6928867
- https://snyk.io/vuln/SNYK-PYTHON-SETUPTOOLS-3180412
- https://snyk.io/vuln/SNYK-PYTHON-SETUPTOOLS-7448482
- https://snyk.io/vuln/SNYK-PYTHON-URLLIB3-7267250
2024-08-01 05:15:49 +00: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
