Cordform common is now a part of the gradle plugin suite (#1474)

Cordform common is now a full gradle plugin and all related gradle hacks are removed.

docs/source/corda-repo-layout.rst

@@ -7,7 +7,6 @@ The Corda repository comprises the following folders:
 * **client** contains libraries for connecting to a node, working with it remotely and binding server-side data to
   JavaFX UI
 * **config** contains logging configurations and the default node configuration file
-* **cordform-common** contains utilities related to building and running nodes
 * **core** containing the core Corda libraries such as crypto functions, types for Corda's building blocks: states,
   contracts, transactions, attachments, etc. and some interfaces for nodes and protocols
 * **docs** contains the Corda docsite in restructured text format as well as the built docs in html. The docs can be

gradle-plugins/cordform-common/README.md

@@ -0,0 +1,4 @@
+# Cordform Common
+
+This project contains common node types that both the Corda gradle plugin suite and Corda project
+require in order to build Corda nodes.

gradle-plugins/settings.gradle

@@ -2,6 +2,4 @@ rootProject.name = 'corda-gradle-plugins'
 include 'publish-utils'
 include 'quasar-utils'
 include 'cordformation'
-include 'cordform-common'
-// TODO: Look into `includeFlat`
-project(':cordform-common').projectDir = new File("$settingsDir/../cordform-common")
+include 'cordform-common'

node/build.gradle

@@ -78,7 +78,7 @@ processSmokeTestResources {
 dependencies {
     compile project(':node-api')
     compile project(':client:rpc')
-    compile project(':cordform-common')
+    compile "net.corda.plugins:cordform-common:$gradle_plugins_version"
 
     compile "com.google.code.findbugs:jsr305:3.0.1"
 

settings.gradle

@@ -38,5 +38,4 @@ include 'samples:irs-demo'
 include 'samples:network-visualiser'
 include 'samples:simm-valuation-demo'
 include 'samples:notary-demo'
-include 'samples:bank-of-corda-demo'
-include 'cordform-common'
+include 'samples:bank-of-corda-demo'

testing/node-driver/build.gradle

@@ -28,7 +28,7 @@ sourceSets {
 
 dependencies {
     compile project(':test-utils')
-    compile project(':cordform-common')
+    compile "net.corda.plugins:cordform-common:$gradle_plugins_version"
 
     // Integration test helpers
     integrationTestCompile "org.assertj:assertj-core:${assertj_version}"