ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 18:56:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6928 from corda/wz/merge-os-43-44-2021-07-19

Browse Source 
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2021/07/19)
This commit is contained in:
Waldemar Żurowski 2021-07-19 21:55:49 +02:00 committed by GitHub
commit 981e5591ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -112,7 +112,7 @@ buildscript {
ext.liquibase_version = '3.6.3'
ext.artifactory_contextUrl = 'https://software.r3.com/artifactory'
ext.snake_yaml_version = constants.getProperty('snakeYamlVersion')
ext.docker_compose_rule_version = '0.35.0'
ext.docker_compose_rule_version = '1.5.0'
ext.selenium_version = '3.141.59'
ext.ghostdriver_version = '2.1.0'
ext.proguard_version = constants.getProperty('proguardVersion')

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

@ -44,12 +44,6 @@ configurations {
systemTestCompile.extendsFrom testCompile
}
repositories {
maven {
url 'https://dl.bintray.com/palantir/releases' // docker-compose-rule is published on bintray
}
}
dependencies {
compile "commons-io:commons-io:$commons_io_version"
compile project(":samples:irs-demo:web")

3
samples/irs-demo/src/system-test/kotlin/net/corda/irs/IRSDemoDockerTest.kt
View File

@ -1,7 +1,6 @@
package net.corda.irs
import com.palantir.docker.compose.DockerComposeRule
import com.palantir.docker.compose.ImmutableDockerComposeRule
import com.palantir.docker.compose.configuration.DockerComposeFiles
import com.palantir.docker.compose.connection.waiting.HealthChecks
import org.junit.ClassRule
@ -30,7 +29,7 @@ class IRSDemoDockerTest {
@ClassRule
@JvmField
var docker: ImmutableDockerComposeRule = DockerComposeRule.builder()
var docker: DockerComposeRule = DockerComposeRule.builder()
.files(DockerComposeFiles.from(
System.getProperty("CORDAPP_DOCKER_COMPOSE"),
System.getProperty("WEB_DOCKER_COMPOSE")))