features samples upgrade

peterli-r3 · peterli-r3 · commit 4fcc8a88e1ad · 2020-10-05T17:13:13.000-04:00
diff --git a/Features/attachment-blacklist/workflows/build.gradle b/Features/attachment-blacklist/workflows/build.gradle
@@ -79,6 +79,7 @@ tasks.withType(JavaCompile) {
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         cordapp project(':contracts')
+	runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"
diff --git a/Features/attachment-sendfile/workflows/build.gradle b/Features/attachment-sendfile/workflows/build.gradle
@@ -64,6 +64,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             deploy = true
         }
         cordapp project(':contracts')
+	runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"
diff --git a/Features/confidentialidentity-whistleblower/workflows/build.gradle b/Features/confidentialidentity-whistleblower/workflows/build.gradle
@@ -68,6 +68,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         cordapp "$corda_release_group:corda-confidential-identities:$corda_release_version"
         cordapp project(':contracts')
+	runSchemaMigration = true
     }
     node {
         name "O=Notary,L=Nakuru,C=KE"
@@ -106,4 +107,4 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 
-}
+}
diff --git a/Features/cordaservice-autopayroll/workflows/build.gradle b/Features/cordaservice-autopayroll/workflows/build.gradle
@@ -69,6 +69,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             deploy = true
         }
         cordapp project(':contracts')
+	runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"
diff --git a/Features/notarychange-iou/build.gradle b/Features/notarychange-iou/build.gradle
@@ -107,6 +107,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         }
         cordapp project(':contracts')
         cordapp project(':workflows')
+	runSchemaMigration = true
     }
     node {
         name "O=NotaryA,L=London,C=GB"
diff --git a/Features/observablestates-tradereporting/workflows/build.gradle b/Features/observablestates-tradereporting/workflows/build.gradle
@@ -21,7 +21,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             deploy = true
         }
         cordapp project(':contracts')
-
+	runSchemaMigration = true
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
     node {
diff --git a/Features/oracle-primenumber/build.gradle b/Features/oracle-primenumber/build.gradle
@@ -77,6 +77,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         projectCordapp {
             deploy = false
         }
+	runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"
diff --git a/Features/queryablestate-carinsurance/build.gradle b/Features/queryablestate-carinsurance/build.gradle
@@ -119,7 +119,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     node {
         name "O=Insurer,L=London,C=GB"
         p2pPort 10005
-        rpcSettings {
+        rpcSettings {gh
             address("localhost:10006")
             adminAddress("localhost:10046")
         }
diff --git a/Features/queryablestate-carinsurance/workflows/src/main/resources/migration/claim-detail.changelog-v1.xml b/Features/queryablestate-carinsurance/workflows/src/main/resources/migration/claim-detail.changelog-v1.xml
@@ -5,12 +5,8 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <changeSet author="R3.Corda" id="create_claim_detail_state">
         <createTable tableName="claim_detail">
-            <column name="output_index" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="transaction_id" type="NVARCHAR(64)">
-                <constraints nullable="false"/>
-            </column>
+            <column name="output_index" type="INT"/>
+            <column name="transaction_id" type="NVARCHAR(64)"/>
             <column name="claimAmount" type="int"/>
             <column name="claimNumber" type="NVARCHAR(64)"/>
             <column name="claimDescription" type="NVARCHAR(64)"/>
diff --git a/Features/queryablestate-carinsurance/workflows/src/main/resources/migration/insurance-detail.changelog-v1.xml b/Features/queryablestate-carinsurance/workflows/src/main/resources/migration/insurance-detail.changelog-v1.xml
@@ -5,12 +5,8 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <changeSet author="R3.Corda" id="create_insurance_detail_state">
         <createTable tableName="insurance_detail">
-            <column name="output_index" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="transaction_id" type="NVARCHAR(64)">
-                <constraints nullable="false"/>
-            </column>
+            <column name="output_index" type="INT"/>
+            <column name="transaction_id" type="NVARCHAR(64)"/>
             <column name="policyNumber" type="NVARCHAR(64)"/>
             <column name="duration" type="int"/>
             <column name="premium" type="int"/>
diff --git a/Features/schedulablestate-heartbeat/workflows/build.gradle b/Features/schedulablestate-heartbeat/workflows/build.gradle
@@ -52,6 +52,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             adminAddress("localhost:10043")
         }
         cordapps = []
+	runSchemaMigration = true
     }
     node {
         name "O=PartyA,L=London,C=GB"

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ tasks.withType(JavaCompile) {`
`79`	`79`	`task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`80`	`80`	`nodeDefaults {`
`81`	`81`	`cordapp project(':contracts')`
	`82`	`+ runSchemaMigration = true`
`82`	`83`	`}`
`83`	`84`	`node {`
`84`	`85`	`name "O=Notary,L=London,C=GB"`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`64`	`64`	`deploy = true`
`65`	`65`	`}`
`66`	`66`	`cordapp project(':contracts')`
	`67`	`+ runSchemaMigration = true`
`67`	`68`	`}`
`68`	`69`	`node {`
`69`	`70`	`name "O=Notary,L=London,C=GB"`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`68`	`68`	`nodeDefaults {`
`69`	`69`	`cordapp "$corda_release_group:corda-confidential-identities:$corda_release_version"`
`70`	`70`	`cordapp project(':contracts')`
	`71`	`+ runSchemaMigration = true`
`71`	`72`	`}`
`72`	`73`	`node {`
`73`	`74`	`name "O=Notary,L=Nakuru,C=KE"`
`@@ -106,4 +107,4 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`106`	`107`	`rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]`
`107`	`108`	`}`
`108`	`109`
`109`		`-}`
	`110`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`69`	`69`	`deploy = true`
`70`	`70`	`}`
`71`	`71`	`cordapp project(':contracts')`
	`72`	`+ runSchemaMigration = true`
`72`	`73`	`}`
`73`	`74`	`node {`
`74`	`75`	`name "O=Notary,L=London,C=GB"`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`107`	`107`	`}`
`108`	`108`	`cordapp project(':contracts')`
`109`	`109`	`cordapp project(':workflows')`
	`110`	`+ runSchemaMigration = true`
`110`	`111`	`}`
`111`	`112`	`node {`
`112`	`113`	`name "O=NotaryA,L=London,C=GB"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`21`	`21`	`deploy = true`
`22`	`22`	`}`
`23`	`23`	`cordapp project(':contracts')`
`24`		`-`
	`24`	`+ runSchemaMigration = true`
`25`	`25`	`rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]`
`26`	`26`	`}`
`27`	`27`	`node {`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`77`	`77`	`projectCordapp {`
`78`	`78`	`deploy = false`
`79`	`79`	`}`
	`80`	`+ runSchemaMigration = true`
`80`	`81`	`}`
`81`	`82`	`node {`
`82`	`83`	`name "O=Notary,L=London,C=GB"`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`119`	`119`	`node {`
`120`	`120`	`name "O=Insurer,L=London,C=GB"`
`121`	`121`	`p2pPort 10005`
`122`		`- rpcSettings {`
	`122`	`+ rpcSettings {gh`
`123`	`123`	`address("localhost:10006")`
`124`	`124`	`adminAddress("localhost:10046")`
`125`	`125`	`}`