Fix MP REST 1.4 TCK

build-parent/pom.xml

@@ -63,7 +63,7 @@
         <microprofile-metrics-api.version>2.3</microprofile-metrics-api.version>
         <microprofile-fault-tolerance-api.version>2.1</microprofile-fault-tolerance-api.version>
         <microprofile-reactive-messaging-api.version>1.0</microprofile-reactive-messaging-api.version>
-        <microprofile-rest-client-api.version>1.3.4</microprofile-rest-client-api.version>
+        <microprofile-rest-client-api.version>1.4.0</microprofile-rest-client-api.version>
         <microprofile-open-api.version>1.1.2</microprofile-open-api.version>
         <microprofile-opentracing-api.version>1.3.3</microprofile-opentracing-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>

extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java

@@ -43,6 +43,7 @@
 import org.jboss.resteasy.spi.ResteasyConfiguration;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
 import io.quarkus.arc.deployment.BeanRegistrarBuildItem;
 import io.quarkus.arc.processor.BeanConfigurator;
 import io.quarkus.arc.processor.BeanRegistrar;
@@ -96,6 +97,12 @@ void setupProviders(BuildProducer<NativeImageResourceBuildItem> resources,
         resources.produce(new NativeImageResourceBuildItem(PROVIDERS_SERVICE_FILE));
     }
 
+    @Record(ExecutionTime.STATIC_INIT)
+    @BuildStep
+    BeanContainerListenerBuildItem fixExtension(RestClientRecorder restClientRecorder) {
+        return new BeanContainerListenerBuildItem(restClientRecorder.hackAroundExtension());
+    }
+
     @BuildStep
     NativeImageProxyDefinitionBuildItem addProxy() {
         return new NativeImageProxyDefinitionBuildItem(ResteasyConfiguration.class.getName());

extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java

@@ -1,16 +1,21 @@
 package io.quarkus.restclient.runtime;
 
+import java.lang.reflect.Field;
 import java.util.Set;
 
+import javax.enterprise.inject.spi.CDI;
 import javax.ws.rs.RuntimeType;
 
 import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;
 import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
 import org.jboss.resteasy.microprofile.client.RestClientBuilderImpl;
+import org.jboss.resteasy.microprofile.client.RestClientExtension;
 import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
 import org.jboss.resteasy.spi.InjectorFactory;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.arc.runtime.BeanContainerListener;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
 
@@ -20,6 +25,21 @@ public class RestClientRecorder {
     public static ResteasyProviderFactory providerFactory;
     public static boolean SSL_ENABLED;
 
+    public BeanContainerListener hackAroundExtension() {
+        return new BeanContainerListener() {
+            @Override
+            public void created(BeanContainer container) {
+                try {
+                    Field f = RestClientExtension.class.getDeclaredField("manager");
+                    f.setAccessible(true);
+                    f.set(null, CDI.current().getBeanManager());
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
     public void setRestClientBuilderResolver() {
         RestClientBuilderResolver.setInstance(new BuilderResolver());
     }