mirror of
https://github.com/corda/corda.git
synced 2024-12-21 05:53:23 +00:00
a2ede0fc73
* Removed Requery object relational mapping usage (and associated schemas including node-schemas module) * Fixed issues with NodeAttachmentService tests. Cannot use JPA custom converters with Primary Key fields. Hibernate entities require explicit call to flush() to persist to disk. * Removed redundant requery converters (equivalents not even required in Hibernate). * Removed remaining gradle requery dependency definitions. * Fixed broken tests. * Fixes for failing NodeVaultService tests: - Dynamic SQL updates (in soft locking code) - Explicit request by session to participate in transaction (causing "TransactionRequiredException" Executing an update/delete query) - Explicit flush() required to persist to disk * Updated changelog. Fixed compiler warning. * Fixed WHERE clause AND/OR condition. Enforced immediate data visibility through transaction commit. * Final fixes to address failing tests. * Deferred all hibernate session/txn management to DatabaseTransactionManager. * Fixed transaction boundaries in failing Cash tests. * Fixes to address failing tests (transaction boundaries, merge detached object, config clean-up). * Final adjustment to transaction boundaries in JUnit tests. * Refactored AttachmentSchemaV1 into NodeAttachmentService itself and referenced from NodeServicesV1. * Refactored HSQL UPDATE statements to use CriteriaUpdate API. * Updated all criteria API getters to reference attribute names by type. * Remove redundant VaultSchema entity name (required when previously using HSQL UPDATE syntax) * Fix compiler warnings. * Minor changes following rebase from master. * Fixed suppress warning type.
218 lines
7.5 KiB
Groovy
218 lines
7.5 KiB
Groovy
apply plugin: 'kotlin'
|
|
// Java Persistence API support: create no-arg constructor
|
|
// see: http://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell
|
|
apply plugin: 'kotlin-jpa'
|
|
apply plugin: 'java'
|
|
apply plugin: 'net.corda.plugins.quasar-utils'
|
|
apply plugin: 'net.corda.plugins.publish-utils'
|
|
apply plugin: 'com.jfrog.artifactory'
|
|
|
|
description 'Corda node modules'
|
|
|
|
//noinspection GroovyAssignabilityCheck
|
|
configurations {
|
|
// we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
|
|
runtime.exclude module: 'isolated'
|
|
|
|
compile {
|
|
// We don't need these because we already include netty-all.
|
|
exclude group: 'io.netty', module: 'netty-transport'
|
|
exclude group: 'io.netty', module: 'netty-handler'
|
|
}
|
|
|
|
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')
|
|
}
|
|
resources {
|
|
srcDir file('src/integration-test/resources')
|
|
}
|
|
}
|
|
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')
|
|
}
|
|
}
|
|
}
|
|
|
|
// Use manual resource copying of log4j2.xml rather than source sets.
|
|
// This prevents problems in IntelliJ with regard to duplicate source roots.
|
|
processResources {
|
|
from file("$rootDir/config/dev/log4j2.xml")
|
|
}
|
|
|
|
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'
|
|
}
|
|
}
|
|
|
|
// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
|
|
// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
|
|
|
|
dependencies {
|
|
compile project(':node-api')
|
|
compile project(':client:rpc')
|
|
compile project(':cordform-common')
|
|
|
|
compile "com.google.code.findbugs:jsr305:3.0.1"
|
|
|
|
// Log4J: logging framework (with SLF4J bindings)
|
|
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
|
|
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
|
|
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
|
|
|
|
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"
|
|
|
|
compile "com.google.guava:guava:$guava_version"
|
|
|
|
// JOpt: for command line flags.
|
|
compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
|
|
|
|
// Artemis: for reliable p2p message queues.
|
|
compile "org.apache.activemq:artemis-server:${artemis_version}"
|
|
compile "org.apache.activemq:artemis-core-client:${artemis_version}"
|
|
runtime ("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
|
|
// Gains our proton-j version from core module.
|
|
exclude group: 'org.apache.qpid', module: 'proton-j'
|
|
}
|
|
|
|
// JAnsi: for drawing things to the terminal in nicely coloured ways.
|
|
compile "org.fusesource.jansi:jansi:$jansi_version"
|
|
|
|
// Manifests: for reading stuff from the manifest file
|
|
compile "com.jcabi:jcabi-manifests:1.1"
|
|
|
|
// GraphStream: For visualisation
|
|
testCompile "org.graphstream:gs-core:1.3"
|
|
testCompile("org.graphstream:gs-ui:1.3") {
|
|
exclude group: "bouncycastle"
|
|
}
|
|
compile("com.intellij:forms_rt:7.0.3") {
|
|
exclude group: "asm"
|
|
}
|
|
|
|
// Jackson support: serialisation to/from JSON, YAML, etc
|
|
compile project(':client:jackson')
|
|
|
|
// Coda Hale's Metrics: for monitoring of key statistics
|
|
compile "io.dropwizard.metrics:metrics-core:3.1.2"
|
|
|
|
// JimFS: in memory java.nio filesystem. Used for test and simulation utilities.
|
|
compile "com.google.jimfs:jimfs:1.1"
|
|
|
|
// TypeSafe Config: for simple and human friendly config files.
|
|
compile "com.typesafe:config:$typesafe_config_version"
|
|
|
|
// Unit testing helpers.
|
|
testCompile "junit:junit:$junit_version"
|
|
testCompile "org.assertj:assertj-core:${assertj_version}"
|
|
testCompile project(':test-utils')
|
|
testCompile project(':client:jfx')
|
|
testCompile project(':finance')
|
|
|
|
// sample test schemas
|
|
testCompile project(path: ':finance', configuration: 'testArtifacts')
|
|
|
|
// For H2 database support in persistence
|
|
compile "com.h2database:h2:$h2_version"
|
|
|
|
// Exposed: Kotlin SQL library - under evaluation
|
|
// TODO: Upgrade to Exposed 0.7 (has API changes)
|
|
compile "org.jetbrains.exposed:exposed:0.5.0"
|
|
|
|
// SQL connection pooling library
|
|
compile "com.zaxxer:HikariCP:2.5.1"
|
|
|
|
// Hibernate: an object relational mapper for writing state objects to the database automatically.
|
|
compile "org.hibernate:hibernate-core:$hibernate_version"
|
|
compile "org.hibernate:hibernate-java8:$hibernate_version"
|
|
|
|
// Capsule is a library for building independently executable fat JARs.
|
|
// We only need this dependency to compile our Caplet against.
|
|
compileOnly "co.paralleluniverse:capsule:$capsule_version"
|
|
|
|
// Java Atomix: RAFT library
|
|
compile 'io.atomix.copycat:copycat-client:1.2.3'
|
|
compile 'io.atomix.copycat:copycat-server:1.2.3'
|
|
compile 'io.atomix.catalyst:catalyst-netty:1.1.2'
|
|
|
|
// Netty: All of it.
|
|
compile "io.netty:netty-all:$netty_version"
|
|
|
|
// CRaSH: An embeddable monitoring and admin shell with support for adding new commands written in Groovy.
|
|
compile("com.github.corda.crash:crash.shell:9d242da2a10e686f33a3aefc69e4768824ad0716") {
|
|
exclude group: "org.slf4j", module: "slf4j-jdk14"
|
|
}
|
|
|
|
// OkHTTP: Simple HTTP library.
|
|
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
|
|
|
|
// BFT-SMaRt
|
|
compile 'commons-codec:commons-codec:1.10'
|
|
compile 'com.github.bft-smart:library:master-v1.1-beta-g6215ec8-87'
|
|
|
|
// FastClasspathScanner: classpath scanning
|
|
compile 'io.github.lukehutch:fast-classpath-scanner:2.0.21'
|
|
|
|
// Integration test helpers
|
|
integrationTestCompile "junit:junit:$junit_version"
|
|
integrationTestCompile "org.assertj:assertj-core:${assertj_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"
|
|
}
|
|
|
|
task integrationTest(type: Test) {
|
|
testClassesDir = sourceSets.integrationTest.output.classesDir
|
|
classpath = sourceSets.integrationTest.runtimeClasspath
|
|
}
|
|
|
|
task smokeTestJar(type: Jar) {
|
|
baseName = project.name + '-smoke-test'
|
|
from sourceSets.smokeTest.output
|
|
}
|
|
|
|
task smokeTest(type: Test) {
|
|
dependsOn smokeTestJar
|
|
testClassesDir = sourceSets.smokeTest.output.classesDir
|
|
classpath = sourceSets.smokeTest.runtimeClasspath
|
|
}
|
|
|
|
jar {
|
|
baseName 'corda-node'
|
|
}
|
|
|
|
publish {
|
|
name jar.baseName
|
|
}
|