Skip to content

Commit c7c9792

Browse files
committed
blacklist deployNodes not working
1 parent b7a1262 commit c7c9792

File tree

5 files changed

+22
-48
lines changed

5 files changed

+22
-48
lines changed

Features/attachment-blacklist/build.gradle

+3-10
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ buildscript {
55

66
ext {
77
corda_release_group = constants.getProperty("cordaReleaseGroup")
8+
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
89
corda_release_version = constants.getProperty("cordaVersion")
10+
corda_core_release_version = constants.getProperty("cordaCoreVersion")
911
corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
1012
kotlin_version = constants.getProperty("kotlinVersion")
1113
junit_version = constants.getProperty("junitVersion")
1214
quasar_version = constants.getProperty("quasarVersion")
1315
log4j_version = constants.getProperty("log4jVersion")
1416
slf4j_version = constants.getProperty("slf4jVersion")
15-
corda_platform_version = constants.getProperty("platformVersion")
17+
corda_platform_version = constants.getProperty("platformVersion").toInteger()
1618
spring_boot_version = '2.0.2.RELEASE'
1719
ext.spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
1820
}
@@ -46,15 +48,6 @@ allprojects {
4648
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
4749
}
4850

49-
// configurations {
50-
// compile {
51-
// // We want to use SLF4J's version of these bindings: jcl-over-slf4j
52-
// // Remove any transitive dependency on Apache's version.
53-
// exclude group: 'commons-logging', module: 'commons-logging'
54-
// }
55-
// }
56-
57-
5851
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
5952
kotlinOptions {
6053
languageVersion = "1.2"

Features/attachment-blacklist/clients/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ springBoot {
3030
mainClassName = "net.corda.samples.blacklist.webserver.Server"
3131
}
3232

33-
task runWebServer(type: JavaExec, dependsOn: assemble) {
34-
classpath = sourceSets.main.runtimeClasspath
35-
main = 'net.corda.samples.blacklist.webserver.Starter'
36-
args '--server.port=10050', '--config.rpc.host=localhost', '--config.rpc.port=10006', '--config.rpc.username=user1', '--config.rpc.password=test'
37-
}
38-
3933
task uploadBlacklist(type: JavaExec, dependsOn: assemble) {
4034
classpath = sourceSets.main.runtimeClasspath
4135
main = 'net.corda.samples.blacklist.clients.ClientKt'

Features/attachment-blacklist/contracts/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
apply plugin: 'kotlin'
21
apply plugin: 'net.corda.plugins.cordapp'
32

4-
jar {
5-
// CorDapps do not configure a Node's logging.
6-
exclude '**/log4j2*.xml'
7-
}
8-
93
cordapp {
10-
targetPlatformVersion corda_platform_version.toInteger()
11-
minimumPlatformVersion corda_platform_version.toInteger()
4+
targetPlatformVersion corda_platform_version
5+
minimumPlatformVersion corda_platform_version
6+
127
contract {
138
name "Attachment Blacklist"
149
vendor "Corda Open Source"
@@ -33,3 +28,8 @@ dependencies {
3328
cordaCompile "$corda_release_group:corda-core:$corda_release_version"
3429
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
3530
}
31+
32+
jar {
33+
// CorDapps do not configure a Node's logging.
34+
exclude '**/log4j2*.xml'
35+
}

Features/attachment-blacklist/repostories.gradle

-8
This file was deleted.

Features/attachment-blacklist/workflows/build.gradle

+11-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
apply plugin: 'kotlin'
21
apply plugin: 'net.corda.plugins.cordapp'
32
apply plugin: 'net.corda.plugins.quasar-utils'
43

5-
6-
jar {
7-
// CorDapps do not configure a Node's logging.
8-
exclude '**/log4j2*.xml'
9-
}
10-
114
cordapp {
12-
targetPlatformVersion corda_platform_version.toInteger()
13-
minimumPlatformVersion corda_platform_version.toInteger()
5+
targetPlatformVersion corda_platform_version
6+
minimumPlatformVersion corda_platform_version
7+
148
workflow {
159
name "Attachment Blacklist"
1610
vendor "Corda Open Source"
@@ -45,18 +39,14 @@ configurations {
4539
}
4640

4741
dependencies {
42+
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
4843
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
4944
testCompile "junit:junit:$junit_version"
5045

5146
// Corda dependencies.
52-
cordaCompile "$corda_release_group:corda-core:$corda_release_version"
53-
cordaCompile "$corda_release_group:corda-jackson:$corda_release_version"
54-
cordaCompile "$corda_release_group:corda-rpc:$corda_release_version"
55-
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
56-
57-
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
58-
// Needed by deployNodes task.
47+
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
5948
cordaRuntime "$corda_release_group:corda:$corda_release_version"
49+
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
6050

6151
// CorDapp dependencies.
6252
cordapp project(":contracts")
@@ -66,3 +56,8 @@ task integrationTest(type: Test, dependsOn: []) {
6656
testClassesDirs = sourceSets.integrationTest.output.classesDirs
6757
classpath = sourceSets.integrationTest.runtimeClasspath
6858
}
59+
60+
jar {
61+
// CorDapps do not configure a Node's logging.
62+
exclude '**/log4j2*.xml'
63+
}

0 commit comments

Comments
 (0)