Skip to content

Commit 5c4e4a6

Browse files
committed
blacklist and sendfile working
1 parent daa47ba commit 5c4e4a6

File tree

3 files changed

+45
-3
lines changed

3 files changed

+45
-3
lines changed

Features/attachment-blacklist/build.gradle

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ buildscript {
44

55
ext {
66
corda_release_group = constants.getProperty("cordaReleaseGroup")
7+
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
78
corda_release_version = constants.getProperty("cordaVersion")
9+
corda_core_release_version = constants.getProperty("cordaCoreVersion")
810
corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
11+
kotlin_version = constants.getProperty("kotlinVersion")
912
junit_version = constants.getProperty("junitVersion")
1013
quasar_version = constants.getProperty("quasarVersion")
1114
log4j_version = constants.getProperty("log4jVersion")
1215
slf4j_version = constants.getProperty("slf4jVersion")
13-
corda_platform_version = constants.getProperty("platformVersion")
16+
corda_platform_version = constants.getProperty("platformVersion").toInteger()
1417
spring_boot_version = '2.0.2.RELEASE'
1518
ext.spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
1619
}
@@ -31,6 +34,8 @@ buildscript {
3134
}
3235

3336
allprojects {
37+
apply from: "${rootProject.projectDir}/repositories.gradle"
38+
apply plugin: 'java'
3439

3540
repositories {
3641
mavenLocal()
@@ -52,12 +57,42 @@ allprojects {
5257
tasks.withType(JavaCompile) {
5358
options.compilerArgs << "-parameters" // Required for shell commands.
5459
}
60+
61+
jar {
62+
// This makes the JAR's SHA-256 hash repeatable.
63+
preserveFileTimestamps = false
64+
reproducibleFileOrder = true
65+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
66+
}
5567
}
5668

5769
apply plugin: 'net.corda.plugins.cordapp'
5870
apply plugin: 'net.corda.plugins.quasar-utils'
5971
apply plugin: 'net.corda.plugins.cordformation'
60-
apply plugin: 'java'
72+
73+
sourceSets {
74+
main {
75+
resources {
76+
srcDir rootProject.file("config/dev")
77+
}
78+
}
79+
}
80+
81+
//Module dependencis
82+
dependencies {
83+
// Corda dependencies.
84+
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
85+
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
86+
cordaRuntime "$corda_release_group:corda:$corda_release_version"
87+
88+
// CorDapp dependencies.
89+
cordapp project(":workflows")
90+
cordapp project(":contracts")
91+
92+
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
93+
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
94+
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
95+
}
6196

6297
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
6398
nodeDefaults {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
repositories {
2+
mavenLocal()
3+
mavenCentral()
4+
jcenter()
5+
maven { url 'https://jitpack.io' }
6+
maven { url 'https://software.r3.com/artifactory/corda' }
7+
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
8+
}

Features/attachment-sendfile/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ allprojects {
4545
options.compilerArgs << "-parameters" // Required for shell commands.
4646
}
4747

48-
4948
jar {
5049
// This makes the JAR's SHA-256 hash repeatable.
5150
preserveFileTimestamps = false

0 commit comments

Comments
 (0)