[tomee] branch master updated: Small revert of JAXRS Application scanning for providers

[jlmonteiro]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 33d60ae  Small revert of JAXRS Application scanning for providers
33d60ae is described below

commit 33d60ae7140595996e274dc4c739d31fd5b8a727
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Thu Jul 8 11:00:12 2021 +0200

    Small revert of JAXRS Application scanning for providers
---
 .../src/main/java/org/apache/openejb/server/rest/RESTService.java      | 3 ++-
 tck/microprofile-tck/openapi/src/test/resources/arquillian.xml         | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
 
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
index bd4c343..b41dcdd 100644
--- 
a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
+++ 
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
@@ -364,7 +364,8 @@ public abstract class RESTService implements ServerService, 
SelfManaging {
                 .filter(Objects::nonNull)
                 .anyMatch(aClass -> aClass.getDeclaredMethods().length > 0);
 
-        if (useDiscoveredProviders(appInfo, !hasExplicitlyDefinedApplication)) 
{
+        // if (useDiscoveredProviders(appInfo, 
!hasExplicitlyDefinedApplication)) {
+        if (useDiscoveredProviders(appInfo)) {
             final Set<String> jaxRsProviders = new 
HashSet<>(webApp.jaxRsProviders);
             jaxRsProviders.addAll(appInfo.jaxRsProviders);
             additionalProviders.addAll(appProviders(jaxRsProviders, 
classLoader));
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml 
b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
index 0090224..669ed09 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -33,7 +33,6 @@
       <property name="cleanOnStartUp">true</property>
       <property name="properties">
         geronimo.openapi.application.append-context-path = false
-        openejb.jaxrs.providers.auto = true
       </property>
     </configuration>
   </container>
@@ -50,7 +49,6 @@
       <property name="properties">
         tomee.mp.scan = all
         geronimo.openapi.application.append-context-path = false
-        openejb.jaxrs.providers.auto = true
       </property>
     </configuration>
   </container>
@@ -67,7 +65,6 @@
       <property name="properties">
         tomee.mp.scan = all
         geronimo.openapi.application.append-context-path = false
-        openejb.jaxrs.providers.auto = true
       </property>
     </configuration>
   </container>