Merge from release/4.12 to resolve conflicts

Author: jakubzadroga

Advanced/secretsanta-cordapp/build.gradle

@@ -13,27 +13,6 @@ buildscript { //properties that you need to build the project
         kotlin_version = constants.getProperty("kotlinVersion")
         junit_version = constants.getProperty("junitVersion")
         quasar_version = constants.getProperty("quasarVersion")
-        quasar_exclusions = [
-                'co.paralleluniverse**',
-                'groovy**',
-                'com.esotericsoftware.**',
-                'jdk**',
-                'junit**',
-                'kotlin**',
-                'net.rubygrapefruit.**',
-                'org.gradle.**',
-                'org.apache.**',
-                'org.jacoco.**',
-                'org.junit**',
-                'org.slf4j**',
-                'worker.org.gradle.**',
-                'org.mockito.kotlin**',
-                'org.assertj**',
-                'org.hamcrest**',
-                'org.mockito**',
-                'org.opentest4j**',
-                'org.springframework**'
-        ]
         log4j_version = constants.getProperty("log4jVersion")
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
@@ -58,7 +37,6 @@ buildscript { //properties that you need to build the project
     repositories {
         mavenLocal()
         mavenCentral()
-        maven { url 'https://jitpack.io' }
         maven { url 'https://download.corda.net/maven/corda-releases' }
     }
 
@@ -67,10 +45,6 @@ buildscript { //properties that you need to build the project
         classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
         classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
-        classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
-
-        classpath "com.sendgrid:sendgrid-java:4.7.0"
-        classpath "com.sendgrid:java-http-client:4.3.6"
     }
 }
 
@@ -86,9 +60,9 @@ allprojects {//Properties that you need to compile your project (The application
         mavenLocal()
 
         mavenCentral()
-        maven { url 'https://jitpack.io' }
-        maven { url 'https://download.corda.net/maven/corda-dependencies' }
         maven { url 'https://download.corda.net/maven/corda-releases' }
+        maven { url 'https://download.corda.net/maven/corda-dependencies' }
+        maven { url 'https://jitpack.io' }
     }
 
     java {
@@ -122,7 +96,6 @@ sourceSets {
 
 //Module dependencies
 dependencies {
-    testImplementation "junit:junit:$junit_version"
     // Corda dependencies.
     cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
     cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {

Advanced/secretsanta-cordapp/clients/build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'org.springframework.boot'
+
 buildscript {
     repositories {
         maven {
@@ -6,8 +8,6 @@ buildscript {
     }
 }
 
-apply plugin: 'org.springframework.boot'
-
 sourceSets {
     main {
         resources {
@@ -17,15 +17,16 @@ sourceSets {
 }
 
 dependencies {
+    implementation 'com.google.code.gson:gson:2.8.5'
+
     // Corda dependencies.
-    implementation "$corda_release_group:corda-rpc:$corda_release_version"
     implementation "$corda_core_release_group:corda-core:$corda_core_release_version"
+    implementation "$corda_release_group:corda-rpc:$corda_release_version"
 
     // CorDapp dependencies.
     implementation project(":contracts")
     implementation project(":workflows")
 
-    implementation 'com.google.code.gson:gson:2.8.5'
     implementation("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
         exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
     }
@@ -60,8 +61,4 @@ task runSantaServer(type: JavaExec, dependsOn: assemble) {
     classpath = sourceSets.main.runtimeClasspath
     main = 'net.corda.samples.secretsanta.webserver.Starter'
     args '--server.port=10056', '--config.rpc.host=localhost', '--config.rpc.port=10016', '--config.rpc.username=user1', '--config.rpc.password=test'
-}
-
-tasks.withType(Jar) {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }

Advanced/secretsanta-cordapp/contracts/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'net.corda.plugins.cordapp'
-apply plugin: 'net.corda.plugins.cordformation'
 
 cordapp {
     targetPlatformVersion corda_platform_version
@@ -34,12 +33,11 @@ configurations {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    testImplementation "junit:junit:$junit_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "junit:junit:$junit_version"
+
     // Corda dependencies.
     cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
-    cordaProvided "$corda_release_group:corda:$corda_release_version"
-    cordaProvided "$corda_release_group:corda-testserver:$corda_release_version"
     testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
     testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
     testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"

Advanced/secretsanta-cordapp/workflows/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'net.corda.plugins.cordapp'
-apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
 
 cordapp {
@@ -17,7 +16,6 @@ sourceSets {
     main {
         java {
             srcDir 'src/main/java'
-            java.outputDir = file('bin/main')
         }
         resources {
             srcDir rootProject.file("config/dev")
@@ -26,7 +24,6 @@ sourceSets {
     test {
         java {
             srcDir 'src/test/java'
-            java.outputDir = file('bin/main')
         }
         resources {
             srcDir rootProject.file("config/test")
@@ -57,7 +54,7 @@ dependencies {
     testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
 
     // SendGrid
-    implementation 'com.sendgrid:sendgrid-java:4.7.0'
+    implementation 'com.sendgrid:sendgrid-java:4.10.2'
 
     // CorDapp dependencies.
     cordapp project(":contracts")