From 596d3884280501ace280b8d1afa34cbe5897e98e Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Wed, 13 Sep 2023 08:43:42 +0300
Subject: [PATCH] Fix RESTEasy CDI dependency issue

The problem is causes by 2aef5323b99f07fa4152179aa94f6207a9577ed4
which contained a Maven exclusion
which results in the dependency not being
added when the client and server part
are mixed.

Fixes: #35889
---
 extensions/resteasy-classic/rest-client/runtime/pom.xml     | 6 ------
 extensions/resteasy-classic/resteasy-common/runtime/pom.xml | 4 ----
 .../resteasy-classic/resteasy-server-common/runtime/pom.xml | 4 ++++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/extensions/resteasy-classic/rest-client/runtime/pom.xml b/extensions/resteasy-classic/rest-client/runtime/pom.xml
index b0095161d1a09..2ec750c3592c3 100644
--- a/extensions/resteasy-classic/rest-client/runtime/pom.xml
+++ b/extensions/resteasy-classic/rest-client/runtime/pom.xml
@@ -25,12 +25,6 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-common</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.resteasy</groupId>
-                    <artifactId>resteasy-cdi</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/resteasy-classic/resteasy-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-common/runtime/pom.xml
index dc485b199d7e1..51726a0e168ab 100644
--- a/extensions/resteasy-classic/resteasy-common/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-common/runtime/pom.xml
@@ -81,10 +81,6 @@
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-cdi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-json-binding-provider</artifactId>
diff --git a/extensions/resteasy-classic/resteasy-server-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-server-common/runtime/pom.xml
index 9175af66fa019..00b5a3bebcd99 100644
--- a/extensions/resteasy-classic/resteasy-server-common/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-server-common/runtime/pom.xml
@@ -25,6 +25,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-cdi</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>