Merge pull request #8389 from famod/issue-8378-remove-wiremock

Remove WireMock from BOM
quarkusio · Apr 6, 2020 · 3df1f24 · 3df1f24
2 parents 62ffcf2 + a12e0eb
commit 3df1f24
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -172,7 +172,6 @@
         <optaplanner.version>7.34.0.Final</optaplanner.version>
         <sundr.version>0.19.1</sundr.version> <!-- this is to avoid annoying pop-up in eclipse about failure to init Velocity logging -->
         <flapdoodle.mongo.version>2.2.0</flapdoodle.mongo.version>
-        <wiremock.version>2.24.1</wiremock.version>
         <quarkus-spring-api.version>5.2.SP1</quarkus-spring-api.version>
         <quarkus-spring-data-api.version>2.1.Final</quarkus-spring-data-api.version>
         <quarkus-spring-security-api.version>5.2.Final</quarkus-spring-security-api.version>
@@ -1038,11 +1037,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock-jre8</artifactId>
-                <version>${wiremock.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>

diff --git a/extensions/spring-cloud-config-client/runtime/pom.xml b/extensions/spring-cloud-config-client/runtime/pom.xml
@@ -46,6 +46,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
+            <version>2.26.3</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -60,6 +61,10 @@
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
                 </exclusion>
+                <exclusion> <!-- fix dependencyConvergence clash with junit-jupiter -->
+                    <groupId>org.opentest4j</groupId>
+                    <artifactId>opentest4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/integration-tests/elytron-security-oauth2/pom.xml b/integration-tests/elytron-security-oauth2/pom.xml
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
+            <version>2.26.3</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -57,6 +58,10 @@
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
                 </exclusion>
+                <exclusion> <!-- fix dependencyConvergence clash with junit-jupiter -->
+                    <groupId>org.opentest4j</groupId>
+                    <artifactId>opentest4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>