mirror of
https://github.com/corda/corda.git
synced 2025-01-14 08:49:47 +00:00
6dd33fb8f7
Major changes due to JDK 17: 1. JDK17 JCE Provider now has built-in support for eddsas, corda uses the bouncycastle (i2p) implementation. This PR removes the conflicting algorithms from the built-in JCE provider. 2. JavaScript scripting has been removed from the JDK, the corda log4j config was using scripting to conditionally output additional diagnostic info if the MDC was populated. This PR has removed the scripting. 3. The artifactory plug-ins used are now deprecated, this PR has removed them and uses the same code as Corda 5 for publishing to artifactory. 4. Javadoc generation has been modified to use the latest dokka plug-ins. 5. Gradle 7.6 has implemented an incredibly annoying change where transitive dependencies are not put on the compile classpath, so that they have to be explicitly added as dependencies to projects. 6. Mockito has been updated, which sadly meant that quite a few source files have to changes to use the new (org.mockito.kotlin) package name. This makes this PR appear much larger than it is. 7. A number of tests have been marked as ignored to get a green, broadly they fall into 3 classes. The first is related to crypto keypair tests, it appears some logic in the JDK prefers to use the SunJCE implementation and we prefer to use bouncycastle. I believe this issue can be fixed with better test setup. The second group is related to our use of a method called "uncheckedCast(..)", the purpose of this method was to get rid of the annoying unchecked cast compiler warning that would otherwise exist. It looks like the Kotlin 1.9 compiler type inference differs and at runtime sometimes the type it infers is "Void" which causes an exception at runtime. The simplest solution is to use an explicit cast instead of unchecked cast, Corda 5 have removed unchecked cast from their codebase. The third class are a number of ActiveMQ tests which appear to have a memory leak somewhere.
78 lines
2.7 KiB
Groovy
78 lines
2.7 KiB
Groovy
/**
|
|
* This build.gradle exists to publish our capsule (executable fat jar) to maven. It cannot be placed in the
|
|
* webserver project because the bintray plugin cannot publish two modules from one project.
|
|
*/
|
|
apply plugin: 'us.kirchmeier.capsule'
|
|
apply plugin: 'corda.common-publishing'
|
|
|
|
description 'Corda node web server capsule'
|
|
|
|
configurations {
|
|
runtimeArtifacts
|
|
capsuleRuntime
|
|
}
|
|
|
|
dependencies {
|
|
// TypeSafe Config: for simple and human friendly config files.
|
|
capsuleRuntime "com.typesafe:config:$typesafe_config_version"
|
|
}
|
|
|
|
jar.enabled = false
|
|
|
|
capsule {
|
|
version capsule_version
|
|
}
|
|
|
|
configurations.runtimeOnly.canBeResolved = true
|
|
task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').tasks.jar) {
|
|
applicationClass 'net.corda.webserver.WebServer'
|
|
archiveBaseName = 'corda-testserver'
|
|
archiveVersion = corda_release_version
|
|
archiveClassifier = jdkClassifier
|
|
archiveName = archiveFileName.get()
|
|
applicationSource = files(
|
|
project(':testing:testserver').configurations.runtimeClasspath,
|
|
project(':testing:testserver').tasks.jar,
|
|
project(':testing:testserver').sourceSets.main.java.outputDir.toString() + '/CordaWebserverCaplet.class',
|
|
project(':testing:testserver').sourceSets.main.java.outputDir.toString() + '/CordaWebserverCaplet$1.class',
|
|
project(':node').buildDir.toString() + '/resources/main/corda-reference.conf',
|
|
"$rootDir/config/dev/log4j2.xml",
|
|
project(':node:capsule').projectDir.toString() + '/NOTICE' // Copy CDDL notice
|
|
)
|
|
from configurations.capsuleRuntime.files.collect { zipTree(it) }
|
|
|
|
capsuleManifest {
|
|
applicationVersion = corda_release_version
|
|
javaAgents = quasar_classifier ? ["quasar-core-${quasar_version}-${quasar_classifier}.jar=m"] : ["quasar-core-${quasar_version}.jar=m"]
|
|
systemProperties['visualvm.display.name'] = 'Corda Webserver'
|
|
minJavaVersion = '17.0'
|
|
caplets = ['CordaWebserverCaplet']
|
|
|
|
// JVM configuration:
|
|
// - Constrain to small heap sizes to ease development on low end devices.
|
|
// - Switch to the G1 GC which is going to be the default in Java 9 and gives low pause times/string dedup.
|
|
//
|
|
// If you change these flags, please also update Driver.kt
|
|
jvmArgs = ['-Xmx200m']
|
|
}
|
|
|
|
manifest {
|
|
attributes('Add-Opens': 'java.management/com.sun.jmx.mbeanserver java.base/java.lang')
|
|
}
|
|
}
|
|
|
|
artifacts {
|
|
runtimeArtifacts buildWebserverJar
|
|
}
|
|
|
|
publishing {
|
|
publications {
|
|
maven(MavenPublication) {
|
|
artifactId 'corda-testserver'
|
|
artifact(buildWebserverJar) {
|
|
classifier ''
|
|
}
|
|
}
|
|
}
|
|
}
|