From ee78e19c461c77ac802f0febf194889e23787cf0 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Fri, 3 May 2024 10:16:47 +0200
Subject: [PATCH] Post merge adjustments

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 tests/e2e/pom.xml                                         | 1 +
 .../tracing/TracingMatchResourceMethodTest.java           | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml
index 7058aaa895c..024afea8c9a 100644
--- a/tests/e2e/pom.xml
+++ b/tests/e2e/pom.xml
@@ -211,6 +211,7 @@
                             <testExcludes>
                                 <testExclude>org/glassfish/jersey/tests/e2e/container/Jersey2462Test.java</testExclude>
                                 <testExclude>org/glassfish/jersey/tests/e2e/container/JettyEmptyHeaderParamTest.java</testExclude>
+                                <testExclude>org/glassfish/jersey/tests/e2e/inject/SingleRequestScopeInjectionTest.java</testExclude>
                             </testExcludes>
                         </configuration>
                     </plugin>
diff --git a/tests/integration/tracing-support/src/test/java/org/glassfish/jersey/tests/integration/tracing/TracingMatchResourceMethodTest.java b/tests/integration/tracing-support/src/test/java/org/glassfish/jersey/tests/integration/tracing/TracingMatchResourceMethodTest.java
index c414032cc62..6afcd91fed2 100644
--- a/tests/integration/tracing-support/src/test/java/org/glassfish/jersey/tests/integration/tracing/TracingMatchResourceMethodTest.java
+++ b/tests/integration/tracing-support/src/test/java/org/glassfish/jersey/tests/integration/tracing/TracingMatchResourceMethodTest.java
@@ -22,9 +22,6 @@
 import org.glassfish.jersey.server.TracingConfig;
 import org.glassfish.jersey.server.internal.ServerTraceEvent;
 import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
-import org.glassfish.jersey.test.spi.TestContainerException;
-import org.glassfish.jersey.test.spi.TestContainerFactory;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
@@ -55,11 +52,6 @@ public String echo(String entity) {
         }
     }
 
-    @Override
-    protected TestContainerFactory getTestContainerFactory() throws TestContainerException {
-        return new ExternalTestContainerFactory();
-    }
-
     @Override
     protected Application configure() {
         return new ResourceConfig(TracingMatchResourceMethodResource.class)