ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2021/07/19)

Browse Source 
Conflicts:
	samples/irs-demo/build.gradle
This commit is contained in:
Waldemar Zurowski 2021-07-19 22:07:31 +02:00
commit f3065b81b5
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

@ -113,7 +113,7 @@ buildscript {
ext.liquibase_version = '3.6.3' ext.liquibase_version = '3.6.3'
ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' ext.artifactory_contextUrl = 'https://software.r3.com/artifactory'
ext.snake_yaml_version = constants.getProperty('snakeYamlVersion') 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.selenium_version = '3.141.59'
ext.ghostdriver_version = '2.1.0' ext.ghostdriver_version = '2.1.0'
ext.proguard_version = constants.getProperty('proguardVersion') ext.proguard_version = constants.getProperty('proguardVersion')

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

@ -44,12 +44,6 @@ configurations {
systemTestCompile.extendsFrom testCompile systemTestCompile.extendsFrom testCompile
} }
repositories {
maven {
url 'https://dl.bintray.com/palantir/releases' // docker-compose-rule is published on bintray
}
}
evaluationDependsOn("cordapp") evaluationDependsOn("cordapp")
evaluationDependsOn("web") evaluationDependsOn("web")

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

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