build: fix also test-scoped conflicts

diennea · Oct 18, 2024 · 02801b5 · 02801b5
1 parent 154e1b2
commit 02801b5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml
@@ -238,15 +238,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${libs.junit}</version>
             <scope>test</scope>
-            <exclusions>
-                <!-- Clashes with org.hamcrest:hamcrest -->
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>pl.pragmatists</groupId>
@@ -286,12 +278,6 @@
             <version>${libs.powermock}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${libs.mockito}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
@@ -304,11 +290,12 @@
                      messes up with Intellij IDEA test run of whole project.
                 -->
                 <exclusion>
-                    <groupId>ch.qos.logback</groupId>
+                    <groupId>org.junit.jupiter</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <!-- We want a single SLF4J backend in our classpath! -->
                 <exclusion>
-                    <groupId>org.junit.jupiter</groupId>
+                    <groupId>ch.qos.logback</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>

diff --git a/pom.xml b/pom.xml
@@ -116,6 +116,7 @@
         <libs.jetty>9.4.44.v20210927</libs.jetty>
         <libs.jersey>2.35</libs.jersey>
         <libs.jackson>2.14.1</libs.jackson>
+        <libs.javassist>3.27.0-GA</libs.javassist>
         <libs.slf4j>1.7.35</libs.slf4j>
         <libs.guava>31.1-jre</libs.guava>
         <libs.lombok>1.18.32</libs.lombok>
@@ -127,7 +128,7 @@
         <libs.junitparams>1.1.1</libs.junitparams>
         <libs.wiremock>2.35.0</libs.wiremock>
         <libs.powermock>2.0.9</libs.powermock>
-        <libs.mockito>3.12.4</libs.mockito>
+        <libs.objenesis>3.0.1</libs.objenesis>
         <libs.hamcrest>2.2</libs.hamcrest>
 
         <libs.asm>9.2</libs.asm>
@@ -269,6 +270,28 @@
                 <artifactId>hamcrest</artifactId>
                 <version>${libs.hamcrest}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${libs.junit}</version>
+                <exclusions>
+                    <!-- Clashes with org.hamcrest:hamcrest -->
+                    <exclusion>
+                        <groupId>org.hamcrest</groupId>
+                        <artifactId>hamcrest-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.objenesis</groupId>
+                <artifactId>objenesis</artifactId>
+                <version>${libs.objenesis}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>${libs.javassist}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -442,6 +465,7 @@
                                         <exclude>com.google.code.findbugs</exclude>
                                         <exclude>org.bouncycastle:*</exclude>
                                         <exclude>org.checkerframework</exclude>
+                                        <exclusion>org.hamcrest:hamcrest-core</exclusion>
                                     </excludes>
                                     <includes>
                                         <include>org.bouncycastle:*-jdk15on</include>