Skip to content

Commit e787b82

Browse files
adelel1adelel1
authored
Merge pull request #109 from corda/jzadroga/ent-11793/jdk17-upgrade-features-tokens
ENT-11793: Upgrade Features CorDapps to JDK17 and Corda 4.12-RC02
2 parents 68a1316 + a7ec9c2 commit e787b82

137 files changed

Lines changed: 4916 additions & 2927 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.

‎Features/attachment-blacklist/build.gradle‎

Lines changed: 53 additions & 12 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) }
@@ -11,11 +13,39 @@ buildscript {
1113
kotlin_version = constants.getProperty("kotlinVersion")
1214
junit_version = constants.getProperty("junitVersion")
1315
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+
]
1437
log4j_version = constants.getProperty("log4jVersion")
1538
slf4j_version = constants.getProperty("slf4jVersion")
1639
corda_platform_version = constants.getProperty("platformVersion").toInteger()
17-
spring_boot_version = '2.0.2.RELEASE'
18-
ext.spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
40+
spring_boot_version = '3.2.5'
41+
ext.spring_boot_gradle_plugin_version = '3.2.5'
42+
43+
test_add_opens = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
44+
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
45+
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
46+
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
47+
'--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
48+
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
1949
}
2050

2151
repositories {
@@ -43,6 +73,7 @@ allprojects {
4373
mavenCentral()
4474
maven { url 'https://jitpack.io' }
4575
maven { url 'https://download.corda.net/maven/corda-dependencies' }
76+
maven { url 'https://download.corda.net/maven/corda-releases' }
4677
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
4778
}
4879

@@ -54,8 +85,13 @@ allprojects {
5485
}
5586
}
5687

57-
tasks.withType(JavaCompile) {
58-
options.compilerArgs << "-parameters" // Required for shell commands.
88+
java {
89+
sourceCompatibility = VERSION_17
90+
targetCompatibility = VERSION_17
91+
}
92+
93+
compileJava {
94+
options.compilerArgs << '-parameters'
5995
}
6096

6197
jar {
@@ -78,22 +114,27 @@ sourceSets {
78114
}
79115
}
80116

81-
//Module dependencis
117+
//Module dependencies
82118
dependencies {
83119
// Corda dependencies.
84-
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
85-
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
86-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
120+
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
121+
cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {
122+
exclude group: "ch.qos.logback", module: "logback-classic"
123+
}
124+
corda "$corda_release_group:corda:$corda_release_version"
87125

88126
// CorDapp dependencies.
89127
cordapp project(":workflows")
90128
cordapp project(":contracts")
91129

92-
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
93-
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
94-
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
95-
cordaDriver "net.corda:corda-shell:4.10"
130+
cordaProvided "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
131+
cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
132+
cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
133+
cordaDriver "net.corda:corda-shell:$corda_release_version"
134+
}
96135

136+
cordapp {
137+
targetPlatformVersion corda_platform_version.toInteger()
97138
}
98139

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

‎Features/attachment-blacklist/clients/build.gradle‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,25 @@ sourceSets {
1111

1212
dependencies {
1313
// Corda dependencies.
14-
compile "$corda_release_group:corda-rpc:$corda_release_version"
14+
implementation "$corda_release_group:corda-rpc:$corda_release_version"
15+
implementation "$corda_core_release_group:corda-core:$corda_core_release_version"
1516

1617
// CorDapp dependencies.
17-
compile project(":contracts")
18-
compile project(":workflows")
18+
implementation project(":contracts")
19+
implementation project(":workflows")
1920

20-
compile("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
21+
implementation("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
2122
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
2223
}
2324

24-
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
25-
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
26-
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
25+
implementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
26+
implementation "org.apache.logging.log4j:log4j-web:${log4j_version}"
27+
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
28+
implementation group: 'com.google.guava', name: 'guava', version: '23.5-jre'
2729
}
2830

2931
springBoot {
30-
mainClassName = "net.corda.samples.blacklist.webserver.Server"
32+
mainClass = "net.corda.samples.blacklist.webserver.Server"
3133
}
3234

3335
task uploadBlacklist(type: JavaExec, dependsOn: assemble) {

‎Features/attachment-blacklist/contracts/build.gradle‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@ cordapp {
1919

2020
dependencies {
2121
testImplementation "junit:junit:$junit_version"
22-
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
23-
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
2422

2523
// Corda dependencies.
26-
cordaCompile "$corda_release_group:corda-core:$corda_release_version"
27-
cordaCompile "$corda_release_group:corda-jackson:$corda_release_version"
28-
cordaCompile "$corda_release_group:corda-rpc:$corda_release_version"
29-
cordaRuntime "$corda_release_group:corda:$corda_release_version"
24+
cordaProvided "$corda_release_group:corda-core:$corda_release_version"
25+
cordaProvided "$corda_release_group:corda-jackson:$corda_release_version"
26+
cordaProvided "$corda_release_group:corda-rpc:$corda_release_version"
27+
cordaProvided "$corda_release_group:corda:$corda_release_version"
28+
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
29+
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
30+
testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
31+
}
3032

33+
test {
34+
jvmArgs = rootProject.ext.test_add_opens
3135
}

‎Features/attachment-blacklist/contracts/src/main/java/net/corda/samples/blacklist/contracts/AgreementContract.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.corda.samples.blacklist.contracts;
22

3-
import com.google.common.base.Charsets;
3+
import kotlin.text.Charsets;
44
import net.corda.core.contracts.*;
55
import net.corda.core.crypto.SecureHash;
66
import net.corda.core.identity.AbstractParty;

‎Features/attachment-blacklist/gradle/wrapper/gradle-wrapper.jar‎

8.46 KB
Binary file not shown.

‎Features/attachment-blacklist/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
36
zipStoreBase=GRADLE_USER_HOME
47
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)