From 4031c28947a5dc8ff233805ab8b894b9fb9ecf10 Mon Sep 17 00:00:00 2001 From: Adel El-Beik <48713346+adelel1@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:24:15 +0000 Subject: [PATCH] ENT-11502: Upgrade platform version to 140. (#7674) --- .../client/rpcreconnect/CordaRPCClientReconnectionTest.kt | 4 ++-- constants.properties | 2 +- core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt | 2 +- ...izerTest.kt => DuplSerializerLogWithSameSerializerTest.kt} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/{DuplicateSerializerLogWithSameSerializerTest.kt => DuplSerializerLogWithSameSerializerTest.kt} (97%) diff --git a/client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt b/client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt index a08164e07f..171fdb8603 100644 --- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt +++ b/client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt @@ -110,11 +110,11 @@ class CordaRPCClientReconnectionTest { assertThatThrownBy { 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) } .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 ") } } diff --git a/constants.properties b/constants.properties index 2c78f945e7..3880d9f178 100644 --- a/constants.properties +++ b/constants.properties @@ -13,7 +13,7 @@ internalPublishVersion=1.+ # When incrementing platformVersion make sure to update # # net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. # # ***************************************************************# -platformVersion=14 +platformVersion=140 openTelemetryVersion=1.20.1 openTelemetrySemConvVersion=1.20.1-alpha guavaVersion=28.0-jre diff --git a/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt b/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt index 16b362926f..f8d92e6702 100644 --- a/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt +++ b/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt @@ -20,7 +20,7 @@ import java.security.PublicKey // 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) { checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature) diff --git a/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplicateSerializerLogWithSameSerializerTest.kt b/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplSerializerLogWithSameSerializerTest.kt similarity index 97% rename from node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplicateSerializerLogWithSameSerializerTest.kt rename to node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplSerializerLogWithSameSerializerTest.kt index 3608bc7a6b..5c3fcef2fb 100644 --- a/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplicateSerializerLogWithSameSerializerTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/DuplSerializerLogWithSameSerializerTest.kt @@ -15,7 +15,7 @@ import org.assertj.core.api.Assertions import org.junit.Test import java.time.Duration -class DuplicateSerializerLogWithSameSerializerTest { +class DuplSerializerLogWithSameSerializerTest { @Test(timeout=300_000) fun `check duplicate serialisers are logged not logged for the same class`() {