From 30167fd2e8f6840920b6fd6f33229a5da5f11cc2 Mon Sep 17 00:00:00 2001
From: Razvan Codreanu <52859362+Schife@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:50:01 +0000
Subject: [PATCH] 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
---
 .ci/dev/on-demand-tests/commentMappings.yml |  1 +
 build.gradle                                | 11 ++++++++++-
 samples/irs-demo/build.gradle               | 15 +++------------
 samples/irs-demo/web/build.gradle           |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.ci/dev/on-demand-tests/commentMappings.yml b/.ci/dev/on-demand-tests/commentMappings.yml
index 3b68c8366c..8f141bea9a 100644
--- a/.ci/dev/on-demand-tests/commentMappings.yml
+++ b/.ci/dev/on-demand-tests/commentMappings.yml
@@ -1,4 +1,5 @@
 integration: { allParallelIntegrationTest }
 pr-merge: { parallelRegressionTest }
 smoke: { allParallelSmokeTest }
+slow: { allParallelSlowIntegrationTest }
 unit: { allParallelUnitTest }
diff --git a/build.gradle b/build.gradle
index 23b522603a..a8a7496ab0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -672,7 +672,16 @@ task parallelRegressionTest(type: ParallelTestGroup) {
     nodeTaints "big"
 }
 task allParallelSmokeTest(type: ParallelTestGroup) {
-    testGroups "slowIntegrationTest", "smokeTest"
+    testGroups "smokeTest"
+    numberOfShards 4
+    streamOutput false
+    coresPerFork 6
+    memoryInGbPerFork 10
+    distribute DistributeTestsBy.CLASS
+    nodeTaints "big"
+}
+task allParallelSlowIntegrationTest(type: ParallelTestGroup) {
+    testGroups "slowIntegrationTest"
     numberOfShards 4
     streamOutput false
     coresPerFork 6
diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index c5157cfd00..7628bf32bc 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -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'
 
diff --git a/samples/irs-demo/web/build.gradle b/samples/irs-demo/web/build.gradle
index 13b5428a84..c7f130691c 100644
--- a/samples/irs-demo/web/build.gradle
+++ b/samples/irs-demo/web/build.gradle
@@ -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'