Skip to content

Commit 7b68135

Browse files
jakubzadrogajakubzadroga
authored
ENT-11793: Upgrade Basic and Advanced CorDapps to JDK17 and Corda 4.12-RC01 (#107)
ENT-11793: Upgrade Basic and Advanced CorDapps to JDK17 and Corda 4.12-RC01
1 parent f774b90 commit 7b68135

84 files changed

Lines changed: 2397 additions & 1453 deletions

File tree

Some content is hidden

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

‎Advanced/auction-cordapp/build.gradle‎

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import static org.gradle.api.JavaVersion.VERSION_17
2+
13
buildscript {
24
Properties constants = new Properties()
35
file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
@@ -8,13 +10,43 @@ buildscript {
810
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
911
corda_core_release_version = constants.getProperty("cordaCoreVersion")
1012
corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
13+
kotlin_version = constants.getProperty("kotlinVersion")
1114
junit_version = constants.getProperty("junitVersion")
1215
quasar_version = constants.getProperty("quasarVersion")
16+
quasar_exclusions = [
17+
'co.paralleluniverse**',
18+
'groovy**',
19+
'com.esotericsoftware.**',
20+
'jdk**',
21+
'junit**',
22+
'kotlin**',
23+
'net.rubygrapefruit.**',
24+
'org.gradle.**',
25+
'org.apache.**',
26+
'org.jacoco.**',
27+
'org.junit**',
28+
'org.slf4j**',
29+
'worker.org.gradle.**',
30+
'org.mockito.kotlin**',
31+
'org.assertj**',
32+
'org.hamcrest**',
33+
'org.mockito**',
34+
'org.opentest4j**',
35+
'org.springframework**'
36+
]
1337
log4j_version = constants.getProperty("log4jVersion")
1438
slf4j_version = constants.getProperty("slf4jVersion")
1539
corda_platform_version = constants.getProperty("platformVersion").toInteger()
16-
spring_boot_version = '2.0.2.RELEASE'
17-
spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
40+
//springboot
41+
spring_boot_version = '3.2.5'
42+
spring_boot_gradle_plugin_version = '3.2.5'
43+
44+
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
45+
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
46+
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
47+
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
48+
'--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
49+
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
1850
}
1951

2052
repositories {
@@ -46,8 +78,13 @@ allprojects {
4678
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
4779
}
4880

49-
tasks.withType(JavaCompile) {
50-
options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
81+
java {
82+
sourceCompatibility = VERSION_17
83+
targetCompatibility = VERSION_17
84+
}
85+
86+
compileJava {
87+
options.compilerArgs << '-parameters'
5188
}
5289

5390
jar {
@@ -71,27 +108,32 @@ sourceSets {
71108
}
72109

73110
dependencies {
74-
testCompile "junit:junit:$junit_version"
111+
testImplementation "junit:junit:$junit_version"
75112

76113
// Corda dependencies.
77-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
78-
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
79-
cordaCompile "$corda_release_group:corda-finance-contracts:$corda_release_version"
80-
cordaCompile "$corda_release_group:corda-finance-workflows:$corda_release_version"
81-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
114+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
115+
cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {
116+
exclude group: "ch.qos.logback", module: "logback-classic"
117+
}
118+
cordaProvided "$corda_release_group:corda-finance-contracts:$corda_release_version"
119+
cordaProvided "$corda_release_group:corda-finance-workflows:$corda_release_version"
120+
corda "$corda_release_group:corda:$corda_release_version"
82121

83122
// CorDapp dependencies.
84123
cordapp("$corda_release_group:corda-finance-contracts:$corda_release_version")
85124
cordapp("$corda_release_group:corda-finance-workflows:$corda_release_version")
86125
cordapp project(":workflows")
87126
cordapp project(":contracts")
88127

89-
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
90-
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
91-
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
128+
cordaProvided "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
129+
cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
130+
cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
92131

93-
cordaDriver "net.corda:corda-shell:4.10"
132+
cordaDriver "net.corda:corda-shell:$corda_release_version"
133+
}
94134

135+
cordapp {
136+
targetPlatformVersion corda_platform_version.toInteger()
95137
}
96138

97139
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {

‎Advanced/auction-cordapp/client/build.gradle‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,32 @@ configurations {
88

99
dependencies {
1010
// Corda dependencies.
11-
compile "$corda_release_group:corda-rpc:$corda_release_version"
11+
implementation "$corda_release_group:corda-rpc:$corda_release_version"
12+
implementation "net.corda:corda-core:$corda_release_version"
13+
implementation "net.corda:corda-jackson:$corda_release_version"
14+
implementation "net.corda:corda-rpc:$corda_release_version"
15+
implementation "net.corda:corda:$corda_release_version"
16+
implementation "$corda_release_group:corda-finance-contracts:$corda_release_version"
17+
implementation "$corda_release_group:corda-finance-workflows:$corda_release_version"
18+
testImplementation "net.corda:corda-node-driver:$corda_release_version"
1219

1320
// CorDapp dependencies.
14-
compile project(":contracts")
15-
compile project(":workflows")
16-
compile "net.corda:corda-core:$corda_release_version"
17-
compile "net.corda:corda-jackson:$corda_release_version"
18-
compile "net.corda:corda-rpc:$corda_release_version"
19-
compile "net.corda:corda:$corda_release_version"
20-
testCompile "net.corda:corda-node-driver:$corda_release_version"
21-
22-
compile("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
21+
implementation project(":contracts")
22+
implementation project(":workflows")
23+
24+
implementation("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
2325
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
2426
}
2527

26-
compile "org.springframework.boot:spring-boot-devtools:$spring_boot_version"
28+
implementation "org.springframework.boot:spring-boot-devtools:$spring_boot_version"
2729

28-
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
29-
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
30-
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
30+
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
31+
implementation "org.apache.logging.log4j:log4j-web:${log4j_version}"
32+
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
3133
}
3234

3335
springBoot {
34-
mainClassName = "net.corda.samples.auction.client.Starter"
36+
mainClass = "net.corda.samples.auction.client.Starter"
3537
}
3638

3739
task runAuctionClient(type: JavaExec, dependsOn: assemble) {

‎Advanced/auction-cordapp/contracts/build.gradle‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@ cordapp {
1414

1515

1616
dependencies {
17-
18-
testCompile "junit:junit:$junit_version"
19-
20-
21-
// Corda dependencies.
22-
cordaCompile "$corda_release_group:corda-finance-contracts:$corda_release_version"
17+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
2318

2419
// Corda dependencies.
25-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
26-
27-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
28-
cordaRuntime "$corda_release_group:corda-testserver:$corda_release_version"
29-
30-
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
31-
cordaRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
20+
cordaProvided "$corda_release_group:corda-finance-contracts:$corda_release_version"
21+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
22+
cordaProvided "$corda_release_group:corda:$corda_release_version"
23+
cordaProvided "$corda_release_group:corda-testserver:$corda_release_version"
24+
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
25+
testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
26+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
27+
28+
cordaProvided "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j_version"
29+
testImplementation "junit:junit:$junit_version"
3230
}

‎Advanced/auction-cordapp/gradle/wrapper/gradle-wrapper.jar‎

8.83 KB
Binary file not shown.

‎Advanced/auction-cordapp/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Fri Aug 25 12:50:39 BST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)