Merge commit 'ae478cc8ad30d086e6748ba5f35433202d74aeba' into chrisr3-44-merge

build.gradle

@@ -465,18 +465,20 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
     }
 }
 
-task detekt(type: JavaExec, dependsOn: ":detekt-plugins:jar") {
+tasks.register('detekt', JavaExec) {
-    main = "io.gitlab.arturbosch.detekt.cli.Main"
-    classpath = configurations.detekt
     def input = "$projectDir"
     def config = "$projectDir/detekt-config.yml"
     def baseline = "$projectDir/detekt-baseline.xml"
-    def plugins = "$projectDir/detekt-plugins/build/libs/detekt-plugins-${version}.jar"
+    def detektPluginsJar = project(':detekt-plugins').tasks.jar
+    def plugins = detektPluginsJar.outputs.files.singleFile
     def params = ['-i', input, '-c', config, '-b', baseline, '--plugins', plugins]
+    inputs.files(detektPluginsJar, config, baseline)
+    main = "io.gitlab.arturbosch.detekt.cli.Main"
+    classpath = configurations.detekt
     args(params)
 }
 
-task detektBaseline(type: JavaExec) {
+tasks.register('detektBaseline', JavaExec) {
     main = "io.gitlab.arturbosch.detekt.cli.Main"
     classpath = configurations.detekt
     def input = "$projectDir"

core/src/main/kotlin/net/corda/core/contracts/Structures.kt

@@ -134,8 +134,7 @@ interface LinearState : ContractState {
     val linearId: UniqueIdentifier
 }
 // DOCEND 2
-
+@DeleteForDJVM
-@KeepForDJVM
 interface SchedulableState : ContractState {
     /**
      * Indicate whether there is some activity to be performed at some future point in time with respect to this
@@ -146,7 +145,6 @@ interface SchedulableState : ContractState {
      *
      * @return null if there is no activity to schedule.
      */
-    @DeleteForDJVM
     fun nextScheduledActivity(thisStateRef: StateRef, flowLogicRefFactory: FlowLogicRefFactory): ScheduledActivity?
 }
 
@@ -176,6 +174,7 @@ data class StateAndRef<out T : ContractState>(val state: TransactionState<T>, va
 // DOCEND 7
 
 /** A wrapper for a [StateAndRef] indicating that it should be added to a transaction as a reference input state. */
+@KeepForDJVM
 data class ReferencedStateAndRef<out T : ContractState>(val stateAndRef: StateAndRef<T>)
 
 /** Filters a list of [StateAndRef] objects according to the type of the states */

detekt-plugins/build.gradle

@@ -1,23 +1,11 @@
 plugins {
-    id 'java'
     id 'kotlin'
-    id 'kotlin-jpa'
-}
-
-sourceCompatibility = 1.8
-
-repositories {
-    mavenCentral()
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    implementation "io.gitlab.arturbosch.detekt:detekt-api:$detekt_version"
+    testImplementation "junit:junit:$junit_version"
     testImplementation "io.gitlab.arturbosch.detekt:detekt-test:$detekt_version"
     testImplementation "org.assertj:assertj-core:$assertj_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "io.gitlab.arturbosch.detekt:detekt-api:$detekt_version"
-}
-
-publish {
-    name "corda-detekt-plugins"
 }

docs/source/network-builder.rst

@@ -16,7 +16,7 @@ Unlike the official image, a `node.conf` file and CorDapps are embedded into the
 More backends may be added in future. The tool is open source, so contributions to add more
 destinations for the containers are welcome!
 
-`Download the Corda Network Builder <https://software.r3.com/artifactory/corda-releases/net/corda/corda-tools-network-builder/|corda_version|/corda-tools-network-builder-|corda_version|.jar>`_.
+`Download the Corda Network Builder <https://software.r3.com/artifactory/corda-releases/net/corda/corda-tools-network-builder/|corda_version|/corda-tools-network-builder-|corda_version|-all.jar>`_.
 
 .. _pre-requisites:
 

serialization-djvm/build.gradle

@@ -12,10 +12,7 @@ description 'Serialization support for the DJVM'
 
 configurations {
     sandboxTesting
-    jdkRt.resolutionStrategy {
+    jdkRt
-        // Always check the repository for a newer SNAPSHOT.
-        cacheChangingModulesFor 0, 'seconds'
-    }
 }
 
 dependencies {
@@ -35,7 +32,7 @@ dependencies {
     // Test utilities
     testImplementation "org.assertj:assertj-core:$assertj_version"
     testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
-    jdkRt "net.corda:deterministic-rt:latest.integration"
+    jdkRt "net.corda:deterministic-rt:$deterministic_rt_version"
 
     // The DJVM will need this classpath to run the unit tests.
     sandboxTesting files(sourceSets.getByName("test").output)