Skip to content

ENT-13302: Upgrade Insurance Business Network CorDapp to JDK17 #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/4.12
Choose a base branch
from
Open

ENT-13302: Upgrade Insurance Business Network CorDapp to JDK17 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions BusinessNetworks/constants.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
cordaVersion=4.9
cordaCoreVersion=4.9
gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71
cordaVersion=4.12.5
cordaCoreVersion=4.12.5
gradlePluginsVersion=5.1.1
kotlinVersion=1.9.23
junitVersion=4.12
quasarVersion=0.7.10
log4jVersion =2.17.1
platformVersion=10
slf4jVersion=1.7.25
nettyVersion=4.1.22.Final
corda_bn_extension_version=1.1-RC03
quasarVersion=0.9.0_r3
log4jVersion=2.23.1
platformVersion=140
slf4jVersion=2.0.12
nettyVersion=4.1.115.Final
corda_bn_extension_version=1.3-SNAPSHOT
44 changes: 28 additions & 16 deletions BusinessNetworks/insurancebusinessnetwork/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9

buildscript { //properties that you need to build the project

Properties constants = new Properties()
Expand All @@ -16,11 +19,17 @@ buildscript { //properties that you need to build the project
slf4j_version = constants.getProperty("slf4jVersion")
corda_platform_version = constants.getProperty("platformVersion").toInteger()
//springboot
spring_boot_version = '2.0.2.RELEASE'
spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
spring_boot_version = '3.2.5'
spring_boot_gradle_plugin_version = '3.2.5'
//Membership Attestation
corda_bn_extension_version=constants.getProperty("corda_bn_extension_version")

testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
'--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
'--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
}

repositories {
Expand Down Expand Up @@ -51,11 +60,11 @@ allprojects { //Properties that you need to compile your project (The applicatio
maven { url 'https://jitpack.io' }
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions {
languageVersion = "1.2"
apiVersion = "1.2"
jvmTarget = "1.8"
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
compilerOptions {
languageVersion = KOTLIN_1_9
apiVersion = KOTLIN_1_9
jvmTarget = JVM_17
javaParameters = true // Useful for reflection.
}
}
Expand All @@ -82,21 +91,20 @@ sourceSets {
//Module dependencis
dependencies {
// Corda dependencies.
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version"
cordaRuntime "$corda_release_group:corda:$corda_release_version"
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
cordaBootstrapper "$corda_release_group:corda-node-api:$corda_release_version"
corda "$corda_release_group:corda:$corda_release_version"

// CorDapp dependencies.
cordapp project(":workflows")
cordapp project(":contracts")
cordapp("net.corda.bn:business-networks-contracts:$corda_bn_extension_version")
cordapp("net.corda.bn:business-networks-workflows:$corda_bn_extension_version")

cordaCompile "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
cordaDriver "net.corda:corda-shell:4.9"

cordaProvided "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
cordaDriver "net.corda:corda-shell:$corda_release_version"
}

//Task to build the jar for ganache.
Expand All @@ -114,6 +122,11 @@ task ganache {
}
}

cordapp {
targetPlatformVersion corda_platform_version.toInteger()
minimumPlatformVersion corda_platform_version.toInteger()
}

//Task to deploy the nodes in order to bootstrap a network
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {

Expand Down Expand Up @@ -170,5 +183,4 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
}
rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
}

}
10 changes: 6 additions & 4 deletions BusinessNetworks/insurancebusinessnetwork/contracts/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ cordapp {
dependencies {
cordapp("net.corda.bn:business-networks-contracts:$corda_bn_extension_version")

compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
// Corda dependencies.
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
testImplementation "junit:junit:$junit_version"
testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
}
Binary file modified BusinessNetworks/insurancebusinessnetwork/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions BusinessNetworks/insurancebusinessnetwork/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Fri Aug 25 12:50:39 BST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
Loading