From acd0f75ae2fdcf71459f0ab52e3ed4331ccb8db2 Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement.escoffier@gmail.com>
Date: Fri, 21 Feb 2020 12:40:10 +0100
Subject: [PATCH] Reverse the dependency between context propagation and
 mutiny.

---
 extensions/mutiny/runtime/pom.xml                  | 14 ++++++++++++++
 .../deployment/pom.xml                             |  7 ++++++-
 .../smallrye-context-propagation/runtime/pom.xml   |  4 ----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/extensions/mutiny/runtime/pom.xml b/extensions/mutiny/runtime/pom.xml
index f2a7b1241..b22af8e70 100644
--- a/extensions/mutiny/runtime/pom.xml
+++ b/extensions/mutiny/runtime/pom.xml
@@ -23,6 +23,20 @@
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>mutiny</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-context-propagation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>mutiny-context-propagation</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>smallrye-reactive-converter-api</artifactId>
diff --git a/extensions/smallrye-context-propagation/deployment/pom.xml b/extensions/smallrye-context-propagation/deployment/pom.xml
index b72df4e5b..d96243a15 100644
--- a/extensions/smallrye-context-propagation/deployment/pom.xml
+++ b/extensions/smallrye-context-propagation/deployment/pom.xml
@@ -42,7 +42,7 @@
             <artifactId>quarkus-undertow-deployment</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- For Single tests -->        
+        <!-- For RX Java tests -->
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
@@ -59,6 +59,11 @@
             <scope>test</scope>
         </dependency>
         <!-- For Mutiny tests -->
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>mutiny-context-propagation</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
diff --git a/extensions/smallrye-context-propagation/runtime/pom.xml b/extensions/smallrye-context-propagation/runtime/pom.xml
index 75f0fb7cd..1eea0784b 100644
--- a/extensions/smallrye-context-propagation/runtime/pom.xml
+++ b/extensions/smallrye-context-propagation/runtime/pom.xml
@@ -38,10 +38,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>mutiny-context-propagation</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>