71e48ed6f2
Merge pull request #7435 from corda/ronanb/merge-4.10--4.11-2023-07-18
...
ES-657: Merging forward updates from 4.10 to 4.11 (2023-07-18)
2023-07-18 11:24:54 +01:00
6abbc6a973
Merge pull request #7434 from corda/wzur-r3/ES-839/merge/release/os/4.9/with/release/os/4.10/2023-07-18
...
ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18)
2023-07-18 11:24:33 +01:00
fa10eb39c2
ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18)
2023-07-18 08:49:20 +01:00
2f80e5a252
ES-657: Merging forward updates from 4.10 to 4.11 (2023-07-18)
2023-07-18 08:48:54 +01:00
08baf823a5
Merge pull request #7431 from corda/ronanb/merge-4.9--4.10-2023-07-17
...
ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17)
2023-07-18 08:43:38 +01:00
c7296c0deb
Merge pull request #7433 from corda/wzur-r3/ES-839/merge/release/os/4.8/with/release/os/4.9/2023-07-17
...
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
2023-07-18 08:33:33 +01:00
e23efb0b2d
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
2023-07-17 22:57:24 +01:00
6a22494431
Merge pull request #7432 from corda/wzur-r3/ES-839/merge/release/os/4.7/with/release/os/4.8/2023-07-17
...
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
2023-07-17 22:50:56 +01:00
36940d228f
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
2023-07-17 19:34:19 +01:00
5a31ed0f23
ES-839: fix for dropping Zulu repository ( #7429 )
...
* make sure `rm` doesn't fail if the file is not present
* it makes it easier for forward merge to a branch with newer base image
without that file
2023-07-17 19:05:58 +01:00
e59145dd61
ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17)
2023-07-17 18:37:05 +01:00
306951c97d
ES-657: add auto import and snyk scanning for c4 corda community docker images ( #7415 )
2023-07-17 18:27:28 +01:00
669d6590af
ENT-10122: Add consuming transaction id to vault states table.
2023-07-17 17:58:31 +01:00
653b731f96
Merge pull request #7427 from corda/ronanb/merge-4.10--4.11-2023-07-17
...
ES-853: Merging forward updates from 4.10 to 4.11 (17/7/23)
2023-07-17 17:05:08 +01:00
991aa9fff9
ES-853: Merging forward updates from 4.10 to 4.11 (2023-07-17)
2023-07-17 14:35:59 +01:00
639acc4c63
Added test to deserialise 4.11 network params
2023-07-17 14:35:16 +01:00
6af6af4a80
Merge pull request #7426 from corda/shams-4.11-merge-6b655c0f
...
ENT-9806, ENT-9941, ENT-8827, ENT-10013, ENT-10016: Forward merge 4.10 to 4.11
2023-07-17 14:14:11 +01:00
03a9a95216
Merge branch 'release/os/4.10' into shams-4.11-merge-6b655c0f
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# node/src/main/kotlin/net/corda/node/internal/ServicesForResolutionImpl.kt
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2023-07-17 10:17:38 +01:00
c3e8284f28
ENT-9927 Ledger Recovery tweaks ( #7409 )
2023-07-17 09:48:37 +01:00
26c18acf8f
Merge pull request #7424 from corda/connelm/merge-4.9-4.10-2023-07-14
...
ES-853: Merging forward updates from 4.9 to 4.10 (2023-07-14)
2023-07-17 09:47:59 +01:00
52f2e8e2e6
ES-853: Correcting forward merge
2023-07-14 18:23:17 +01:00
b01f85fb11
Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14
...
# Conflicts:
# build.gradle
2023-07-14 18:19:55 +01:00
45c021326f
Merge pull request #7421 from corda/ronanb/merge-4.8-4.9-2023-07-13
...
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
2023-07-14 17:34:32 +01:00
6b655c0f91
Merge pull request #7420 from corda/shams-4.10-merge-e6a80822
...
ENT-9806, ENT-9941, ENT-8827, ENT-10013, ENT-10016: Forward merge 4.9 to 4.10
2023-07-14 13:28:44 +01:00
58ecce1713
ENT-9875: New network parameters ( #7398 )
...
* ENT-9875: Added new network parameters
- Added `transactionRecoveryPeriod`
- Added `confidentialIdentityPreGenerationPeriod`
These new parameters are currently set to be nullable meaning they can be ignored and the duration if not specified will be null rather than, e.g., 0. This currently allows for nothing changing/breaking in the node-api
_Note: if these params can stay as nullable then the deprecated constructor might not even be needed (since the existing one will still work), needs to be discussed._
2023-07-14 12:02:21 +01:00
befae353ac
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
2023-07-13 15:25:55 +01:00
7a27a464f6
Merge pull request #7419 from corda/ronanb/merge-4.7-4.8-2023-07-13
...
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
2023-07-13 15:12:05 +01:00
5ecb36c302
Merge fix
2023-07-13 11:31:35 +01:00
3a6deeefa7
Merge branch 'release/os/4.9' into shams-4.10-merge-e6a80822
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# .snyk
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2023-07-13 10:53:30 +01:00
e6a808226e
Merge pull request #7412 from corda/shams-4.9-merge-0b8536b9
...
ENT-10013, ENT-10016: 4.8 to 4.9 forward merge
2023-07-13 09:38:08 +01:00
6bcc843f19
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
2023-07-13 07:07:17 +01:00
c58bb4a090
Merge pull request #7418 from corda/ronanb/merge--4.6-4.7-2023-07-12
...
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
2023-07-13 06:52:08 +01:00
010a9a6c08
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
2023-07-12 20:02:32 +01:00
33df909cee
ES-757: update paramater in line with latest shared lib change ( #7417 )
2023-07-12 20:01:56 +01:00
b410cd2a5d
ES-853: update Artifactory refrences to new public location ( #7416 )
...
* ES-853: update artifactory references to new public location
2023-07-12 17:36:57 +01:00
d6c858e42e
Merge pull request #7414 from corda/ES-757-Remove-Extra-paramater-from-the-calling-side
...
ES-757: ensure correct method is called with extra paramater
2023-07-12 11:11:50 +01:00
9dd0bd8509
ES-757: ensure correct method is called with extra paramater
2023-07-11 13:11:02 +01:00
1e0f7cd690
Merge fix
2023-07-07 15:29:44 +01:00
671ce9ef97
Merge branch 'os-4.8-merge-point' into shams-4.9-merge-0b8536b9
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
2023-07-07 15:20:43 +01:00
0f2312a201
ENT-8983 - Postgres migration failure ( #7408 )
...
* Set DB transaction isolation level only if its going to change; upgraded dependencies
* Removed duplicate changeset
2023-07-07 13:29:35 +01:00
401a8593d2
Merge pull request #7411 from corda/ronanb/merge-4.7-4.8-2023-07-05
...
ES-839: Merging forward updates from 4.7 to 4.8 (2023-07-25)
2023-07-06 13:58:11 +01:00
5e3ee980b3
INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-07-05)
2023-07-05 20:54:02 +01:00
56c6eb42ef
ES-757: remove extra paramater ( #7403 )
2023-07-05 16:28:51 +01:00
6b1a2cb027
ES-839: Disable Internal docker publishing for 4.7 ( only supported post 4.9 pacthes) ( #7410 )
...
* ES-839: Disable Docker publishing for 4.7
* ES-839: remove broken repo
2023-07-05 16:28:08 +01:00
97d8549d4f
ENT-9927 Ledger Recovery tweaks. ( #7407 )
2023-07-03 10:02:34 +01:00
49d5b6a4bf
ENT-4973 Introduce explicit constructors to evolve ReceiveFinalityFlow for binary backwards compatibility ( #7404 )
...
* Introduce explicit constructors to evolve ReceiveFinalityFlow for binary backwards compatibility.
2023-06-29 11:19:59 +01:00
e100bee4f1
ENT-10076,ENT-10080 - Security Vulnerabilities ( #7405 )
...
* Updated dependencies
* Address compiler checks
2023-06-28 13:20:58 +01:00
d02f6ff68c
ENT-10048,ENT-10050 - Security vulnerabilities ( #7397 )
...
* Updated netty and tcnative
2023-06-27 13:29:28 +01:00
59404fbdfc
Merge pull request #7399 from corda/adel/merge-from-os4.10-23jun-23
...
ENT-9962, ES-562: Merge from OS 4.10
2023-06-26 14:16:25 +01:00
0afd220cfd
Merge pull request #7401 from corda/ronanb/merge-4.6-4.7-2023-06-23
...
ES-758: forward merge 4.6 -> 4.7
2023-06-26 08:59:12 +01:00
