ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-11502: Upgrade platform version to 140. (#7674)

Browse Source
This commit is contained in:
Adel El-Beik 2024-03-04 12:24:15 +00:00 committed by GitHub
parent dea3e0a574
commit 4031c28947
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt
View File

@ -110,11 +110,11 @@ class CordaRPCClientReconnectionTest {
assertThatThrownBy { assertThatThrownBy {
val node = startNode () val node = startNode ()
val client = CordaRPCClient(node.rpcAddress, config.copy(minimumServerProtocolVersion = 100, maxReconnectAttempts = 1)) val client = CordaRPCClient(node.rpcAddress, config.copy(minimumServerProtocolVersion = 999, maxReconnectAttempts = 1))
client.start(rpcUser.username, rpcUser.password, gracefulReconnect = gracefulReconnect) client.start(rpcUser.username, rpcUser.password, gracefulReconnect = gracefulReconnect)
} }
.isInstanceOf(UnrecoverableRPCException::class.java) .isInstanceOf(UnrecoverableRPCException::class.java)
.hasMessageStartingWith("Requested minimum protocol version (100) is higher than the server's supported protocol version ") .hasMessageStartingWith("Requested minimum protocol version (999) is higher than the server's supported protocol version ")
} }
} }

2
constants.properties
View File

@ -13,7 +13,7 @@ internalPublishVersion=1.+
# When incrementing platformVersion make sure to update # # When incrementing platformVersion make sure to update #
# net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. # # net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. #
# ***************************************************************# # ***************************************************************#
platformVersion=14 platformVersion=140
openTelemetryVersion=1.20.1 openTelemetryVersion=1.20.1
openTelemetrySemConvVersion=1.20.1-alpha openTelemetrySemConvVersion=1.20.1-alpha
guavaVersion=28.0-jre guavaVersion=28.0-jre

2
core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt
View File

@ -20,7 +20,7 @@ import java.security.PublicKey
// When incrementing platformVersion make sure to update PLATFORM_VERSION in constants.properties as well. // When incrementing platformVersion make sure to update PLATFORM_VERSION in constants.properties as well.
const val PLATFORM_VERSION = 14 const val PLATFORM_VERSION = 140
fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) { fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) {
checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature) checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature)

2
node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplicateSerializerLogWithSameSerializerTest.kt → node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplSerializerLogWithSameSerializerTest.kt
View File

@ -15,7 +15,7 @@ import org.assertj.core.api.Assertions
import org.junit.Test import org.junit.Test
import java.time.Duration import java.time.Duration
class DuplicateSerializerLogWithSameSerializerTest { class DuplSerializerLogWithSameSerializerTest {
@Test(timeout=300_000) @Test(timeout=300_000)
fun `check duplicate serialisers are logged not logged for the same class`() { fun `check duplicate serialisers are logged not logged for the same class`() {