TM-204 Fixing regression builds (#6009)

* TM-204 attempting to fix regression builds

* TM-204 attempting to fix regression builds

* TM-204 reverting spring boot version and only removing missing dependency

* TM-204 reverting to original build.gradle

* TM-204 re applying dependency

* TM-204 consolidating dependencies

* TM-204 setting spring boot dependency

* TM-204 reverting and upgrading dependency management plugin version in parent gradle file

* TM-204 apply dependency plugin differently

* TM-204 new gradle files

* TM-204 try and fix corda rpc evaluation

* TM-204 try and fix corda rpc evaluation

* TM-204 separate slow integration and smoke test
This commit is contained in:
Razvan Codreanu
2020-03-02 14:50:01 +00:00
committed by GitHub
parent ae17669892
commit 30167fd2e8
4 changed files with 16 additions and 15 deletions

View File

@ -1,14 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.21.RELEASE'
}
repositories {
mavenCentral()
}
dependencies {
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
classpath "io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE"
}
plugins {
id "org.springframework.boot" version "1.5.21.RELEASE"
id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
}
// Spring Boot plugin adds a numerous hardcoded dependencies in the version much lower then Corda expects
@ -23,7 +15,6 @@ ext['mockito.version'] = "$mockito_version"
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'application'

View File

@ -12,8 +12,9 @@ buildscript {
}
plugins {
id 'io.spring.dependency-management'
id 'com.craigburke.client-dependencies' version '1.4.0'
id 'io.spring.dependency-management'
id 'org.springframework.boot'
}
group = "${parent.group}.irs-demo"
@ -55,7 +56,6 @@ ext['jackson.version'] = jackson_version
apply plugin: 'kotlin'
apply plugin: 'kotlin-spring'
apply plugin: 'eclipse'
apply plugin: 'org.springframework.boot'
apply plugin: 'project-report'
apply plugin: 'application'