Skip to content

Commit c7ed65d

Browse files
jakubzadrogajakubzadroga
committed
Upgrade Tokentofriend CorDapp to JDK17
1 parent 1152d1c commit c7ed65d

8 files changed

Lines changed: 284 additions & 189 deletions

File tree

‎Tokens/tokentofriend/build.gradle‎

Lines changed: 33 additions & 30 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 {//properties that you need to build the project
24
Properties constants = new Properties()
35
file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
@@ -14,11 +16,18 @@ buildscript {//properties that you need to build the project
1416
slf4j_version = constants.getProperty("slf4jVersion")
1517
corda_platform_version = constants.getProperty("platformVersion").toInteger()
1618
//springboot
17-
spring_boot_version = '2.0.2.RELEASE'
18-
spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
19+
spring_boot_version = '2.5.5'
20+
spring_boot_gradle_plugin_version = '2.5.5'
1921
//Token
2022
tokens_release_group = 'com.r3.corda.lib.tokens'
21-
tokens_release_version = '1.2'
23+
tokens_release_version = '1.3-RC02'
24+
25+
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
26+
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
27+
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
28+
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
29+
'--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
30+
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
2231
}
2332

2433
repositories {
@@ -45,15 +54,21 @@ allprojects {//Properties that you need to compile your project (The application
4554

4655
mavenCentral()
4756
maven { url 'https://download.corda.net/maven/corda-dependencies' }
57+
maven { url 'https://download.corda.net/maven/corda-releases' }
4858
maven { url 'https://jitpack.io' }
4959
//SDK lib
5060
maven { url 'https://download.corda.net/maven/corda-lib' }
5161
//Gradle Plugins
5262
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
5363
}
5464

55-
tasks.withType(JavaCompile) {
56-
options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
65+
java {
66+
sourceCompatibility = VERSION_17
67+
targetCompatibility = VERSION_17
68+
}
69+
70+
compileJava {
71+
options.compilerArgs << '-parameters'
5772
}
5873

5974
jar {
@@ -78,24 +93,30 @@ sourceSets {
7893
//Module dependencis
7994
dependencies {
8095
// Corda dependencies.
81-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
82-
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
83-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
96+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
97+
cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {
98+
exclude group: "ch.qos.logback", module: "logback-classic"
99+
}
100+
corda "$corda_release_group:corda:$corda_release_version"
84101

85102
// CorDapp dependencies.
86103
cordapp project(":workflows")
87104
cordapp project(":contracts")
88105

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"
92-
cordaDriver "net.corda:corda-shell:4.10"
106+
cordaProvided "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
107+
cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
108+
cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
109+
cordaDriver "net.corda:corda-shell:$corda_release_version"
93110

94111
// Token SDK dependencies.
95112
cordapp "$tokens_release_group:tokens-contracts:$tokens_release_version"
96113
cordapp "$tokens_release_group:tokens-workflows:$tokens_release_version"
97114
}
98115

116+
cordapp {
117+
targetPlatformVersion corda_platform_version.toInteger()
118+
}
119+
99120
//Task to deploy the nodes in order to bootstrap a network
100121
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
101122

@@ -134,24 +155,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
134155
}
135156
rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
136157
}
137-
// node {
138-
// name "O=USEast3,L=New York,C=US"
139-
// p2pPort 10008
140-
// rpcSettings {
141-
// address("localhost:10009")
142-
// adminAddress("localhost:10049")
143-
// }
144-
// rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
145-
// }
146-
// node {
147-
// name "O=AsiaEast,L=Beijing,C=CN"
148-
// p2pPort 10011
149-
// rpcSettings {
150-
// address("localhost:10012")
151-
// adminAddress("localhost:10052")
152-
// }
153-
// rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
154-
// }
155158
node {
156159
name "O=USWest1,L=San Diego,C=US"
157160
p2pPort 10014

‎Tokens/tokentofriend/clients/build.gradle‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,24 @@ sourceSets {
2020
}
2121

2222
dependencies {
23-
2423
implementation 'com.google.code.gson:gson:2.8.5'
2524

2625
// Corda dependencies.
27-
compile "$corda_release_group:corda-rpc:$corda_release_version"
26+
implementation "$corda_release_group:corda-rpc:$corda_release_version"
2827

2928
// CorDapp dependencies.
30-
compile project(":contracts")
31-
compile project(":workflows")
32-
compile("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
29+
implementation project(":contracts")
30+
implementation project(":workflows")
31+
implementation("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
3332
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
3433
}
35-
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
36-
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
37-
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
34+
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
35+
implementation "org.apache.logging.log4j:log4j-web:${log4j_version}"
36+
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
3837
}
3938

4039
springBoot {
41-
mainClassName = "net.corda.samples.tokentofriend.webserver.Server"
40+
mainClass = "net.corda.samples.tokentofriend.webserver.Server"
4241
}
4342

4443
task copyWebApp(type: Copy) {

‎Tokens/tokentofriend/contracts/build.gradle‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ sourceSets {
2929

3030
dependencies {
3131
// Corda dependencies.
32-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
33-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
34-
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
32+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
33+
cordaProvided "$corda_release_group:corda:$corda_release_version"
34+
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
3535
// Token SDK dependencies.
36-
cordaCompile "$tokens_release_group:tokens-contracts:$tokens_release_version"
36+
cordaProvided "$tokens_release_group:tokens-contracts:$tokens_release_version"
37+
}
38+
39+
test {
40+
jvmArgs = rootProject.ext.testJvmArgs
3741
}

‎Tokens/tokentofriend/gradle/wrapper/gradle-wrapper.jar‎

8.83 KB
Binary file not shown.

‎Tokens/tokentofriend/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +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-all.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
7-

0 commit comments

Comments
 (0)