From 4b84182ab0d0d5cdae207196b033709687f6df88 Mon Sep 17 00:00:00 2001
From: Christian Sailer <christian.sailer@r3.com>
Date: Thu, 3 Sep 2020 10:45:35 +0100
Subject: [PATCH] NOTICK Make the projects under common not depend on anything
 Corda. (#6675)

---
 common/logging/build.gradle    | 10 ++++++++--
 common/validation/build.gradle |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/logging/build.gradle b/common/logging/build.gradle
index 1d614efbc4..98afc0d6cd 100644
--- a/common/logging/build.gradle
+++ b/common/logging/build.gradle
@@ -15,12 +15,18 @@ dependencies {
 
     compile "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
 
-    testCompile project(":test-utils")
-    testCompile "com.nhaarman:mockito-kotlin:$mockito_kotlin_version"
+    // Need to depend on one other Corda project in order to get hold of a valid manifest for the tests
+    testCompile project(":common-validation")
+
+    // test dependencies
+    testImplementation "junit:junit:$junit_version"
+    testCompile group: "org.jetbrains.kotlin", name: "kotlin-test", version: kotlin_version
     testCompile "org.mockito:mockito-core:$mockito_version"
+    testCompile "com.natpryce:hamkrest:$hamkrest_version"
 }
 
 
+
 task generateSource(type: Copy) {
     from 'src/main/template'
     filter(ReplaceTokens, tokens: [corda_release_version: corda_release_version])
diff --git a/common/validation/build.gradle b/common/validation/build.gradle
index 61521193b3..5f54996c3f 100644
--- a/common/validation/build.gradle
+++ b/common/validation/build.gradle
@@ -6,8 +6,6 @@ apply plugin: 'com.jfrog.artifactory'
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
-    testCompile project(":test-utils")
 }
 
 jar {