Skip to content

Commit a7ec9c2

Browse files
jakubzadrogajakubzadroga
committed
Upgrade contractsdk CorDapp to JDK17
1 parent f666776 commit a7ec9c2

10 files changed

Lines changed: 292 additions & 179 deletions

File tree

‎Features/contractsdk-recordplayers/build.gradle‎

Lines changed: 32 additions & 15 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) }
@@ -16,8 +18,15 @@ buildscript { //properties that you need to build the project
1618
corda_platform_version = constants.getProperty("platformVersion").toInteger()
1719

1820
// springboot
19-
spring_boot_version = '2.0.2.RELEASE'
20-
spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
21+
spring_boot_version = '3.2.5'
22+
spring_boot_gradle_plugin_version = '3.2.5'
23+
24+
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
25+
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
26+
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
27+
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
28+
'--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
29+
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
2130
}
2231

2332
repositories {
@@ -44,11 +53,17 @@ allprojects {//Properties that you need to compile your project (The application
4453

4554
mavenCentral()
4655
maven { url 'https://download.corda.net/maven/corda-dependencies' }
56+
maven { url 'https://download.corda.net/maven/corda-releases' }
4757
maven { url 'https://jitpack.io' }
4858
}
4959

50-
tasks.withType(JavaCompile) {
51-
options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
60+
java {
61+
sourceCompatibility = VERSION_17
62+
targetCompatibility = VERSION_17
63+
}
64+
65+
compileJava {
66+
options.compilerArgs << '-parameters'
5267
}
5368

5469
jar {
@@ -70,25 +85,28 @@ sourceSets {
7085
}
7186
}
7287
}
73-
//Module dependencis
88+
//Module dependencies
7489
dependencies {
7590
// Corda dependencies.
76-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
77-
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
78-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
91+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
92+
cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {
93+
exclude group: "ch.qos.logback", module: "logback-classic"
94+
}
95+
corda "$corda_release_group:corda:$corda_release_version"
7996

8097
// CorDapp dependencies.
8198
cordapp project(":contracts")
8299
cordapp project(":workflows")
83100

84-
85-
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
86-
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
87-
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
88-
cordaDriver "net.corda:corda-shell:4.10"
89-
101+
cordaProvided "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
102+
cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
103+
cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
104+
cordaDriver "net.corda:corda-shell:$corda_release_version"
90105
}
91106

107+
cordapp {
108+
targetPlatformVersion corda_platform_version.toInteger()
109+
}
92110

93111
//Task to deploy the nodes in order to bootstrap a network
94112
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
@@ -146,5 +164,4 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
146164
}
147165
rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
148166
}
149-
150167
}

‎Features/contractsdk-recordplayers/clients/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,22 @@ sourceSets {
1010

1111
dependencies {
1212
// Corda dependencies.
13-
compile "$corda_release_group:corda-rpc:$corda_release_version"
13+
implementation "$corda_release_group:corda-rpc:$corda_release_version"
14+
implementation "$corda_release_group:corda-core:$corda_release_version"
1415

1516
// CorDapp dependencies.
16-
compile project(":contracts")
17-
compile project(":workflows")
18-
compile("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
17+
implementation project(":contracts")
18+
implementation project(":workflows")
19+
implementation("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
1920
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
2021
}
21-
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
22-
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
23-
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
22+
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
23+
implementation "org.apache.logging.log4j:log4j-web:${log4j_version}"
24+
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
2425
}
2526

2627
springBoot {
27-
mainClassName = "com.template.webserver.Server"
28+
mainClass = "com.template.webserver.Server"
2829
}
2930

3031
/* The Client is the communication channel between the external and the node. This task will help you immediately

‎Features/contractsdk-recordplayers/clients/src/main/java/net/corda/samples/contractsdk/webserver/NodeRPCConnection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.springframework.beans.factory.annotation.Value;
88
import org.springframework.stereotype.Component;
99

10-
import javax.annotation.PostConstruct;
11-
import javax.annotation.PreDestroy;
10+
import jakarta.annotation.PostConstruct;
11+
import jakarta.annotation.PreDestroy;
1212

1313
/**
1414
* Wraps an RPC connection to a Corda node.

‎Features/contractsdk-recordplayers/contracts/build.gradle‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,19 @@ sourceSets {
4242

4343

4444
dependencies {
45+
testImplementation "junit:junit:$junit_version"
46+
4547
// include contracts
46-
// corda_contracts_sdk_version="0.9-SNAPSHOT"
47-
compile "com.r3.corda.lib.contracts:contract-sdk:0.9-SNAPSHOT"
48+
implementation "com.r3.corda.lib.contracts:contract-sdk:1.0-SNAPSHOT"
4849

4950
// Corda dependencies.
50-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
51-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
52-
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
51+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
52+
cordaProvided "$corda_release_group:corda:$corda_release_version"
53+
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
54+
testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
55+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
56+
}
57+
58+
test {
59+
jvmArgs = rootProject.ext.test_add_opens
5360
}

‎Features/contractsdk-recordplayers/contracts/src/test/java/net/corda/samples/contractsdk/states/StateTests.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.junit.Test;
1313

1414
import static junit.framework.TestCase.assertEquals;
15-
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
import static org.junit.Assert.assertTrue;
1616

1717
public class StateTests {
1818
private final MockServices ledgerServices = new MockServices();
@@ -74,8 +74,5 @@ public void updateMethodTests() {
7474
assertEquals(50, st.update(st.getNeedle(), 50, 650, 8000, st.getSongsPlayed()).getMagneticStrength());
7575
assertEquals(650, st.update(st.getNeedle(), 50, 650, 8000, st.getSongsPlayed()).getCoilTurns());
7676
assertEquals(8000, st.update(st.getNeedle(), 50, 650, 8000, st.getSongsPlayed()).getAmplifierSNR());
77-
7877
}
79-
80-
8178
}

‎Features/contractsdk-recordplayers/gradle/wrapper/gradle-wrapper.jar‎

8.83 KB
Binary file not shown.

‎Features/contractsdk-recordplayers/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)