SONAR-23133 move hamcrest-core dependency to hamcrest. remove obsolete exclusion of hamcrest from mockito.

8 files changed, 8 insertions, 10 deletions

diff --git a/build.gradle b/build.gradle
index fab067fea85..cc24ad81425 100644
--- a/build.gradle
+++ b/build.gradle
@@ -431,9 +431,7 @@ subprojects {
       dependency 'org.hamcrest:hamcrest:2.2'
       dependency 'org.jsoup:jsoup:1.17.2'
       dependency 'org.mindrot:jbcrypt:0.4'
-      dependency('org.mockito:mockito-core:5.12.0') {
-        exclude 'org.hamcrest:hamcrest-core'
-      }
+      dependency('org.mockito:mockito-core:5.12.0')
       dependency('org.mockito:mockito-junit-jupiter:5.12.0') {
         exclude 'org.junit.jupiter:junit-jupiter-api'
       }
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index 4b9d4a46a00..613083e5d6e 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -28,7 +28,7 @@ dependencies {
   testImplementation 'com.tngtech.java:junit-dataprovider'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.hamcrest:hamcrest'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.awaitility:awaitility'
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index 39315f15079..32d17033858 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -41,7 +41,7 @@ dependencies {
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.apache.logging.log4j:log4j-core'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.hamcrest:hamcrest'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'org.junit.jupiter:junit-jupiter-params'
   testImplementation 'org.mockito:mockito-core'
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index 3360cc80f3c..6413e9101e5 100644
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -27,7 +27,7 @@ dependencies {
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'org.junit.jupiter:junit-jupiter-params'
-  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.hamcrest:hamcrest'
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.simpleframework:simple'
   testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures'
diff --git a/sonar-duplications/build.gradle b/sonar-duplications/build.gradle
index 2afa1c31eda..6a623bae939 100644
--- a/sonar-duplications/build.gradle
+++ b/sonar-duplications/build.gradle
@@ -16,6 +16,6 @@ dependencies {
   testImplementation 'commons-io:commons-io'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.hamcrest:hamcrest'
   testImplementation 'org.mockito:mockito-core'
 }
diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index 4435154e347..b8f1cee9c07 100644
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -66,7 +66,7 @@ dependencies {
   testImplementation 'org.junit.jupiter:junit-jupiter-params'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'com.fasterxml.staxmate:staxmate'
-  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.hamcrest:hamcrest'
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures'
diff --git a/sonar-testing-ldap/build.gradle b/sonar-testing-ldap/build.gradle
index e3bedf7a54f..9d9f468bfb9 100644
--- a/sonar-testing-ldap/build.gradle
+++ b/sonar-testing-ldap/build.gradle
@@ -12,6 +12,6 @@ dependencies {
 
     testImplementation 'junit:junit'
     testImplementation 'org.assertj:assertj-core'
-    testImplementation 'org.hamcrest:hamcrest-core'
+    testImplementation 'org.hamcrest:hamcrest'
     testImplementation 'org.mockito:mockito-core'
 }
diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index ada9702050c..4c8f23c9e5d 100644
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     testImplementation 'org.apache.commons:commons-lang3'
     testImplementation 'junit:junit'
     testImplementation 'org.assertj:assertj-core'
-    testImplementation 'org.hamcrest:hamcrest-core'
+    testImplementation 'org.hamcrest:hamcrest'
     testImplementation 'org.mockito:mockito-core'
     testImplementation project(':sonar-testing-harness')