ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-23 09:25:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge open master

Browse Source
This commit is contained in:
Andras Slemmer
2017-08-29 15:08:04 +01:00
parent e79da0ebae a84cd567d8
commit a4ba8e4f2f
526 changed files with 7849 additions and 7317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node/capsule/build.gradle
View File

@ -26,8 +26,8 @@ task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').compileJava) {
applicationSource = files(
project(':node').configurations.runtime,
project(':node').jar,
'../build/classes/main/CordaCaplet.class',
'../build/classes/main/CordaCaplet$1.class',
project(':node').sourceSets.main.java.outputDir.toString() + '/CordaCaplet.class',
project(':node').sourceSets.main.java.outputDir.toString() + '/CordaCaplet$1.class',
"$rootDir/config/dev/log4j2.xml"
)
from 'NOTICE' // Copy CDDL notice