Fix jetty tests

elastic · Nov 29, 2023 · c24dc02 · c24dc02
1 parent 6a43339
commit c24dc02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/...2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java b/...2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java
@@ -78,8 +78,8 @@ public static void beforeClass() {
     public void setUp() {
         doReturn(true).when(config.getConfig(ReporterConfiguration.class)).isReportSynchronously();
         restTemplate = new TestRestTemplate(new RestTemplateBuilder()
-            .setConnectTimeout(Duration.ZERO)
-            .setReadTimeout(Duration.ZERO)
+            .setConnectTimeout(Duration.ofSeconds(10))
+            .setReadTimeout(Duration.ofSeconds(10))
             .basicAuthentication("username", "password"));
         reporter.reset();
     }

diff --git a/integration-tests/spring-boot-3/spring-boot-3-jetty/pom.xml b/integration-tests/spring-boot-3/spring-boot-3-jetty/pom.xml
@@ -16,11 +16,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version> <!-- jetty doesn't support servlet API 6.x -->
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>spring-boot-2-base</artifactId>