Skip to content

Commit 720cbd9

Browse files
peterli-r3peterli-r3
authored
Merge pull request #25 from corda/corda4.6-upgrade
Corda 4.6 upgrade
2 parents 01cfd10 + e651438 commit 720cbd9

File tree

48 files changed

+310
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+310
-35
lines changed

‎Accounts/constants.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
cordaReleaseGroup=net.corda
22
cordaCoreReleaseGroup=net.corda
3-
cordaVersion=4.5
4-
cordaCoreVersion=4.5
5-
gradlePluginsVersion=5.0.10
3+
cordaVersion=4.6
4+
cordaCoreVersion=4.6
5+
gradlePluginsVersion=5.0.12
66
kotlinVersion=1.2.71
77
junitVersion=4.12
88
quasarVersion=0.7.10
99
log4jVersion =2.11.2
10-
platformVersion=5
10+
platformVersion=8
1111
slf4jVersion=1.7.25
1212
nettyVersion=4.1.22.Final

‎Accounts/supplychain/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
131131

132132
cordapp project(":contracts")
133133
cordapp project(":workflows")
134+
runSchemaMigration = true
134135
}
135136
node {
136137
name "O=Notary,L=London,C=GB"

‎Accounts/tictacthor/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
143143
cordapp("$confidential_id_release_group:ci-workflows:$confidential_id_release_version")
144144
cordapp("$accounts_release_group:accounts-contracts:$accounts_release_version")
145145
cordapp("$accounts_release_group:accounts-workflows:$accounts_release_version")
146+
runSchemaMigration = true
146147
}
147148
node {
148149
name "O=Notary,L=London,C=GB"

‎Accounts/worldcupticketbooking/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
163163
cordapp("$tokens_release_group:tokens-workflows:$tokens_release_version")
164164
cordapp("$tokens_release_group:tokens-money:$tokens_release_version")
165165
cordapp("$tokens_release_group:tokens-selection:$tokens_release_version")
166+
runSchemaMigration = true
166167
}
167168
node {
168169
name "O=Notary,L=London,C=GB"

‎Advanced/auction-cordapp/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
107107
cordapp("$corda_release_group:corda-finance-workflows:$corda_release_version")
108108
cordapp project(':contracts')
109109
cordapp project(':workflows')
110+
runSchemaMigration = true
110111
}
111112
node {
112113
name "O=Notary,L=London,C=GB"
@@ -155,4 +156,4 @@ task installQuasar(type: Copy) {
155156
from(configurations.quasar) {
156157
rename 'quasar-core(.*).jar', 'quasar.jar'
157158
}
158-
}
159+
}

‎Advanced/constants.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
cordaReleaseGroup=net.corda
22
cordaCoreReleaseGroup=net.corda
3-
cordaVersion=4.5
4-
cordaCoreVersion=4.5
5-
gradlePluginsVersion=5.0.10
3+
cordaVersion=4.6
4+
cordaCoreVersion=4.6
5+
gradlePluginsVersion=5.0.12
66
kotlinVersion=1.2.71
77
junitVersion=4.12
88
quasarVersion=0.7.10
99
log4jVersion =2.11.2
10-
platformVersion=5
10+
platformVersion=8
1111
slf4jVersion=1.7.25
1212
nettyVersion=4.1.22.Final

‎Advanced/negotiation-cordapp/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
124124
nodeDefaults {
125125

126126
cordapp project(':contracts')
127+
runSchemaMigration = true
127128
}
128129
node {
129130
name "O=Notary,L=London,C=GB"

‎Advanced/obligation-cordapp/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
109109
}
110110
cordapp project(':contracts')
111111
cordapp project(':workflows')
112+
runSchemaMigration = true
112113
cordapp("$corda_release_group:corda-finance-contracts:$corda_release_version")
113114
cordapp("$corda_release_group:corda-finance-workflows:$corda_release_version")
114115
cordapp("$corda_release_group:corda-confidential-identities:$corda_release_version")

‎Basic/constants.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
cordaReleaseGroup=net.corda
22
cordaCoreReleaseGroup=net.corda
3-
cordaVersion=4.5
4-
cordaCoreVersion=4.5
5-
gradlePluginsVersion=5.0.10
3+
cordaVersion=4.6
4+
cordaCoreVersion=4.6
5+
gradlePluginsVersion=5.0.12
66
kotlinVersion=1.2.71
77
junitVersion=4.12
88
quasarVersion=0.7.10
99
log4jVersion =2.11.2
10-
platformVersion=5
10+
platformVersion=8
1111
slf4jVersion=1.7.25
1212
nettyVersion=4.1.22.Final

‎Basic/cordapp-example/.idea/workspace.xml‎

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)