mirror of
https://github.com/corda/corda.git
synced 2024-12-27 16:28:56 +00:00
5c53a91785
1. The runRPCCashIssue and runWebCashIssue gradle tasks didn't work because they were using the wrong ports 2. Notary lookup was failing because the lookup name didn't include the correct CN for the notary name (this slipped through when reverting the network parameters) The ports change occurred in #1922 which was attempting the fix the runIssuer gradle task. This is actually a misleading and redundant task as all it does is start up the nodes, which is what the documented deployNodes already does. The ports runIssuer allocated to the nodes were different to the ones specified in deployNodes. To make sure we have integration tests which closely match deployNodes, the BoC demo has been updated to make use of CordformDefinition. This keeps the node definitions in one place, removing the need to have disparate files in sync. runIssuer has been removed.
177 lines
5.3 KiB
Groovy
177 lines
5.3 KiB
Groovy
apply plugin: 'kotlin'
|
|
apply plugin: 'kotlin-jpa'
|
|
apply plugin: 'net.corda.plugins.quasar-utils'
|
|
apply plugin: 'net.corda.plugins.publish-utils'
|
|
apply plugin: 'net.corda.plugins.api-scanner'
|
|
apply plugin: 'com.jfrog.artifactory'
|
|
|
|
description 'Corda core'
|
|
|
|
evaluationDependsOn(':node:capsule')
|
|
|
|
configurations {
|
|
integrationTestCompile.extendsFrom testCompile
|
|
integrationTestRuntime.extendsFrom testRuntime
|
|
|
|
smokeTestCompile.extendsFrom compile
|
|
smokeTestRuntime.extendsFrom runtime
|
|
}
|
|
|
|
sourceSets {
|
|
integrationTest {
|
|
kotlin {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test/kotlin')
|
|
}
|
|
java {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test/java')
|
|
}
|
|
}
|
|
smokeTest {
|
|
kotlin {
|
|
// We must NOT have any Node code on the classpath, so do NOT
|
|
// include the test or integrationTest dependencies here.
|
|
compileClasspath += main.output
|
|
runtimeClasspath += main.output
|
|
srcDir file('src/smoke-test/kotlin')
|
|
}
|
|
java {
|
|
compileClasspath += main.output
|
|
runtimeClasspath += main.output
|
|
srcDir file('src/smoke-test/java')
|
|
}
|
|
}
|
|
}
|
|
|
|
processSmokeTestResources {
|
|
// Bring in the fully built corda.jar for use by NodeFactory in the smoke tests
|
|
from(project(':node:capsule').tasks['buildCordaJAR']) {
|
|
rename 'corda-(.*)', 'corda.jar'
|
|
}
|
|
}
|
|
|
|
buildscript {
|
|
repositories {
|
|
mavenCentral()
|
|
}
|
|
}
|
|
|
|
dependencies {
|
|
testCompile "junit:junit:$junit_version"
|
|
testCompile "commons-fileupload:commons-fileupload:$fileupload_version"
|
|
|
|
// Guava: Google test library (collections test suite)
|
|
testCompile "com.google.guava:guava-testlib:$guava_version"
|
|
|
|
// Bring in the MockNode infrastructure for writing protocol unit tests.
|
|
testCompile project(":node")
|
|
testCompile project(":node-driver")
|
|
|
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
|
|
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
|
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
|
|
|
|
// Quasar, for suspendable fibres.
|
|
compileOnly "co.paralleluniverse:quasar-core:$quasar_version:jdk8"
|
|
|
|
// Thread safety annotations
|
|
compile "com.google.code.findbugs:jsr305:$jsr305_version"
|
|
|
|
// Log4J: logging framework (ONLY explicitly referenced by net.corda.core.utilities.Logging.kt)
|
|
compile "org.apache.logging.log4j:log4j-core:${log4j_version}"
|
|
|
|
// SLF4J: commons-logging bindings for a SLF4J back end
|
|
compile "org.slf4j:jcl-over-slf4j:$slf4j_version"
|
|
compile "org.slf4j:slf4j-api:$slf4j_version"
|
|
|
|
// AssertJ: for fluent assertions for testing
|
|
testCompile "org.assertj:assertj-core:${assertj_version}"
|
|
|
|
// Guava: Google utilities library.
|
|
testCompile "com.google.guava:guava:$guava_version"
|
|
|
|
// Smoke tests do NOT have any Node code on the classpath!
|
|
smokeTestCompile project(':smoke-test-utils')
|
|
smokeTestCompile "org.assertj:assertj-core:${assertj_version}"
|
|
smokeTestCompile "junit:junit:$junit_version"
|
|
|
|
// RxJava: observable streams of events.
|
|
compile "io.reactivex:rxjava:$rxjava_version"
|
|
|
|
// Apache JEXL: An embeddable expression evaluation library.
|
|
// This may be temporary until we experiment with other ways to do on-the-fly contract specialisation via an API.
|
|
compile "org.apache.commons:commons-jexl3:3.0"
|
|
|
|
// For JSON
|
|
compile "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
|
|
|
|
// Java ed25519 implementation. See https://github.com/str4d/ed25519-java/
|
|
compile "net.i2p.crypto:eddsa:$eddsa_version"
|
|
|
|
// Bouncy castle support needed for X509 certificate manipulation
|
|
compile "org.bouncycastle:bcprov-jdk15on:${bouncycastle_version}"
|
|
compile "org.bouncycastle:bcpkix-jdk15on:${bouncycastle_version}"
|
|
|
|
// JPA 2.1 annotations.
|
|
compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final"
|
|
|
|
// required to use @Type annotation
|
|
compile "org.hibernate:hibernate-core:$hibernate_version"
|
|
}
|
|
|
|
// TODO Consider moving it to quasar-utils in the future (introduced with PR-1388)
|
|
task copyQuasarJar(type: Copy) {
|
|
from configurations.quasar
|
|
into "$project.rootProject.projectDir/lib"
|
|
rename { filename -> "quasar.jar"}
|
|
}
|
|
|
|
jar.finalizedBy(copyQuasarJar)
|
|
|
|
configurations {
|
|
testArtifacts.extendsFrom testRuntime
|
|
}
|
|
|
|
task testJar(type: Jar) {
|
|
classifier "tests"
|
|
from sourceSets.test.output
|
|
}
|
|
|
|
task integrationTest(type: Test) {
|
|
testClassesDirs = sourceSets.integrationTest.output.classesDirs
|
|
classpath = sourceSets.integrationTest.runtimeClasspath
|
|
}
|
|
|
|
task smokeTestJar(type: Jar) {
|
|
classifier 'smokeTests'
|
|
from sourceSets.smokeTest.output
|
|
}
|
|
|
|
task smokeTest(type: Test) {
|
|
dependsOn smokeTestJar
|
|
testClassesDirs = sourceSets.smokeTest.output.classesDirs
|
|
classpath = sourceSets.smokeTest.runtimeClasspath
|
|
}
|
|
|
|
artifacts {
|
|
testArtifacts testJar
|
|
}
|
|
|
|
jar {
|
|
baseName 'corda-core'
|
|
}
|
|
|
|
scanApi {
|
|
excludeClasses = [
|
|
// Kotlin should probably have declared this class as "synthetic".
|
|
"net.corda.core.Utils\$toFuture\$1\$subscription\$1"
|
|
]
|
|
}
|
|
|
|
publish {
|
|
name jar.baseName
|
|
}
|