experiment: use Jetty 11.0.15 with unchanged HeaderRule

camunda · Jun 8, 2023 · fb29d80 · fb29d80
1 parent e7acb28
commit fb29d80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/webapps/assembly-jakarta/pom.xml b/webapps/assembly-jakarta/pom.xml
@@ -20,7 +20,7 @@
 
     <version.xml.jaxb-impl>4.0.2</version.xml.jaxb-impl>
     <version.resteasy>6.2.3.Final</version.resteasy>
-    <version.jetty>11.0.14</version.jetty>
+    <version.jetty>11.0.15</version.jetty>
     <version.jersey2>3.1.1</version.jersey2>
 
     <web.resources.override>${jakarta.runtime}/default/webapp</web.resources.override>

diff --git a/webapps/assembly/src/test/java/org/camunda/bpm/webapp/impl/util/HeaderRule.java b/webapps/assembly/src/test/java/org/camunda/bpm/webapp/impl/util/HeaderRule.java
@@ -16,14 +16,14 @@
  */
 package org.camunda.bpm.webapp.impl.util;
 
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.junit.rules.ExternalResource;
+
 import java.io.IOException;
-import java.net.BindException;
 import java.net.HttpURLConnection;
 import java.net.ProtocolException;
 import java.net.URL;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.rules.ExternalResource;
 
 /**
  * @author Tassilo Weidner
@@ -35,9 +35,7 @@ public class HeaderRule extends ExternalResource {
   protected Server server = new Server(SERVER_PORT);
   protected WebAppContext webAppContext = new WebAppContext();
   protected HttpURLConnection connection = null;
-  protected int startupRetries = 3;
 
-  @Override
   protected void before() {
     try {
       server.stop();
@@ -46,7 +44,6 @@ protected void before() {
     }
   }
 
-  @Override
   protected void after() {
     try {
       server.stop();
@@ -69,19 +66,8 @@ public void startServer(String webDescriptor, String scope, String contextPath)
     try {
       server.start();
     } catch (Exception e) {
-      if (e.getCause() instanceof BindException && startupRetries > 0) {
-        startupRetries--;
-        try {
-          Thread.sleep(500L);
-        } catch (Exception ex) {
-        }
-        startServer(webDescriptor, scope, contextPath);
-      } else {
-        startupRetries = 3;
-        throw new RuntimeException(e);
-      }
+      throw new RuntimeException(e);
     }
-    startupRetries = 3;
   }
 
   public void performRequest() {
@@ -161,11 +147,11 @@ public int getResponseCode() {
       throw new RuntimeException(e);
     }
   }
-
+  
   public String getSessionCookieRegex(String path, String sameSite, boolean secure) {
     return getSessionCookieRegex(path, "JSESSIONID", sameSite, secure);
   }
-
+  
   public String getSessionCookieRegex(String path, String cookieName, String sameSite, boolean secure) {
     StringBuilder regex = new StringBuilder(cookieName + "=.*;\\W*Path=/");
     if (path != null) {