Merge branch 'main' into release

MrMatthewLayton · MrMatthewLayton · commit eff186bd0859 · 2022-04-15T15:32:36.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
         corda_artifactory_url = 'https://software.r3.com/artifactory'
         corda_group = 'net.corda'
-        corda_release_version = '4.8'
+        corda_release_version = '4.9'
 
         corda_gradle_plugin_group = 'net.corda.plugins'
         corda_gradle_plugin_version = '5.0.4'
@@ -14,9 +14,9 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_corda_core_release_version = '4.0.0'
+        onixlabs_corda_core_release_version = '4.0.1'
 
-        cordapp_platform_version = 10
+        cordapp_platform_version = 11
         cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
         cordapp_workflow_name = 'ONIXLabs Corda Identity Framework Workflow'
         cordapp_vendor_name = 'ONIXLabs'
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 name=onixlabs-corda-identity-framework
 group=io.onixlabs
-version=4.0.0
+version=4.0.1
 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3
diff --git a/onixlabs-corda-identity-framework-contract/src/test/kotlin/io/onixlabs/corda/identityframework/contract/ContractTest.kt b/onixlabs-corda-identity-framework-contract/src/test/kotlin/io/onixlabs/corda/identityframework/contract/ContractTest.kt
@@ -47,7 +47,7 @@ abstract class ContractTest {
     @BeforeEach
     private fun setup() {
         val networkParameters = testNetworkParameters(
-            minimumPlatformVersion = 10,
+            minimumPlatformVersion = 11,
             notaries = listOf(NotaryInfo(NOTARY.party, true))
         )
         _services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)
diff --git a/onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/IntegrationTest.kt b/onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/IntegrationTest.kt
@@ -53,7 +53,7 @@ abstract class IntegrationTest : AutoCloseable {
             waitForAllNodesToFinish = false,
             inMemoryDB = true,
             premigrateH2Database = true,
-            networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
+            networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
             cordappsForAllNodes = cordappsForPackages(
                 "io.onixlabs.corda.core.workflow",
                 "io.onixlabs.corda.identityframework.contract",
diff --git a/onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/FlowTest.kt b/onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/FlowTest.kt
@@ -89,7 +89,7 @@ abstract class FlowTest {
     private fun setup() {
         _network = MockNetwork(
             MockNetworkParameters(
-                networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
+                networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
                 cordappsForAllNodes = cordappsForPackages(
                     "io.onixlabs.corda.core.workflow",
                     "io.onixlabs.corda.identityframework.contract",
diff --git a/onixlabs-test-cordapp-contract/src/test/kotlin/io/onixlabs/test/cordapp/contract/ContractTest.kt b/onixlabs-test-cordapp-contract/src/test/kotlin/io/onixlabs/test/cordapp/contract/ContractTest.kt
@@ -48,7 +48,7 @@ abstract class ContractTest {
     @BeforeEach
     private fun setup() {
         val networkParameters = testNetworkParameters(
-            minimumPlatformVersion = 10,
+            minimumPlatformVersion = 11,
             notaries = listOf(NotaryInfo(NOTARY.party, true))
         )
         _services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)
diff --git a/onixlabs-test-cordapp-workflow/src/test/kotlin/io/onixlabs/test/cordapp/workflow/FlowTest.kt b/onixlabs-test-cordapp-workflow/src/test/kotlin/io/onixlabs/test/cordapp/workflow/FlowTest.kt
@@ -68,7 +68,7 @@ abstract class FlowTest {
     private fun setup() {
         _network = MockNetwork(
             MockNetworkParameters(
-                networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
+                networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
                 cordappsForAllNodes = cordappsForPackages(
                     "io.onixlabs.corda.core.workflow",
                     "io.onixlabs.corda.identityframework.contract",

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ abstract class ContractTest {`
`47`	`47`	`@BeforeEach`
`48`	`48`	`private fun setup() {`
`49`	`49`	`val networkParameters = testNetworkParameters(`
`50`		`- minimumPlatformVersion = 10,`
	`50`	`+ minimumPlatformVersion = 11,`
`51`	`51`	`notaries = listOf(NotaryInfo(NOTARY.party, true))`
`52`	`52`	`)`
`53`	`53`	`_services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ abstract class ContractTest {`
`48`	`48`	`@BeforeEach`
`49`	`49`	`private fun setup() {`
`50`	`50`	`val networkParameters = testNetworkParameters(`
`51`		`- minimumPlatformVersion = 10,`
	`51`	`+ minimumPlatformVersion = 11,`
`52`	`52`	`notaries = listOf(NotaryInfo(NOTARY.party, true))`
`53`	`53`	`)`
`54`	`54`	`_services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)`