ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-02 16:53:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Put IRS spring whatever back on classpath

Browse Source
This commit is contained in:
Andras Slemmer 2017-12-15 15:29:54 +00:00
parent 69bfc9b437
commit 58f76ee2da
2 changed files with 62 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/irs-demo/build.gradle
View File

@ -53,6 +53,8 @@ dependencies {
testCompile project(':node-driver') testCompile project(':node-driver')
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
testCompile "org.assertj:assertj-core:${assertj_version}" testCompile "org.assertj:assertj-core:${assertj_version}"
integrationTestCompile project(path: ":samples:irs-demo:web", configuration: "demoArtifacts")
} }
bootRepackage { bootRepackage {

107
samples/irs-demo/web/build.gradle
View File

@ -1,34 +1,34 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}") classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}")
} }
} }
plugins { plugins {
id 'com.craigburke.client-dependencies' version '1.4.0' id 'com.craigburke.client-dependencies' version '1.4.0'
} }
clientDependencies { clientDependencies {
registry 'realBower', type:'bower', url:'https://registry.bower.io' registry 'realBower', type:'bower', url:'https://registry.bower.io'
realBower { realBower {
"angular"("1.5.8") "angular"("1.5.8")
"jquery"("^3.0.0") "jquery"("^3.0.0")
"angular-route"("1.5.8") "angular-route"("1.5.8")
"lodash"("^4.13.1") "lodash"("^4.13.1")
"angular-fcsa-number"("^1.5.3") "angular-fcsa-number"("^1.5.3")
"jquery.maskedinput"("^1.4.1") "jquery.maskedinput"("^1.4.1")
"requirejs"("^2.2.0") "requirejs"("^2.2.0")
"semantic-ui"("^2.2.2", into: "semantic") "semantic-ui"("^2.2.2", into: "semantic")
} }
// put the JS dependencies into src directory so it can easily be referenced // put the JS dependencies into src directory so it can easily be referenced
// from HTML files in webapp frontend, useful for testing/development // from HTML files in webapp frontend, useful for testing/development
// Note that this dir is added to .gitignore // Note that this dir is added to .gitignore
installDir = 'src/main/resources/static/js/bower_components' installDir = 'src/main/resources/static/js/bower_components'
} }
// Spring Boot plugin adds a numerous hardcoded dependencies in the version much lower then Corda expects // Spring Boot plugin adds a numerous hardcoded dependencies in the version much lower then Corda expects
@ -44,36 +44,49 @@ apply plugin: 'org.springframework.boot'
apply plugin: 'project-report' apply plugin: 'project-report'
apply plugin: 'application' apply plugin: 'application'
configurations {
demoArtifacts.extendsFrom testRuntime
}
dependencies { dependencies {
compile('org.springframework.boot:spring-boot-starter-web') { compile('org.springframework.boot:spring-boot-starter-web') {
exclude module: "spring-boot-starter-logging" exclude module: "spring-boot-starter-logging"
exclude module: "logback-classic" exclude module: "logback-classic"
} }
compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9") compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9")
compile project(":client:rpc") compile project(":client:rpc")
compile project(":client:jackson") compile project(":client:jackson")
compile project(":test-utils") compile project(":test-utils")
compile project(path: ":samples:irs-demo:cordapp", configuration: "demoArtifacts") compile project(path: ":samples:irs-demo:cordapp", configuration: "demoArtifacts")
testCompile('org.springframework.boot:spring-boot-starter-test') { testCompile('org.springframework.boot:spring-boot-starter-test') {
exclude module: "spring-boot-starter-logging" exclude module: "spring-boot-starter-logging"
exclude module: "logback-classic" exclude module: "logback-classic"
} }
} }
jar { jar {
from sourceSets.test.output from sourceSets.test.output
dependsOn clientInstall dependsOn clientInstall
} }
task deployWebapps(type: Copy, dependsOn: ['jar', 'bootRepackage']) { task deployWebapps(type: Copy, dependsOn: ['jar', 'bootRepackage']) {
ext.webappDir = file("build/webapps") ext.webappDir = file("build/webapps")
from(jar.outputs) from(jar.outputs)
from("src/test/resources/scripts/") { from("src/test/resources/scripts/") {
filter { it filter { it
.replace('#JAR_PATH#', jar.archiveName) .replace('#JAR_PATH#', jar.archiveName)
.replace('#DIR#', ext.webappDir.getAbsolutePath()) .replace('#DIR#', ext.webappDir.getAbsolutePath())
} }
} }
into ext.webappDir into ext.webappDir
}
task demoJar(type: Jar) {
classifier "test"
from sourceSets.test.output
}
artifacts {
demoArtifacts demoJar
} }