From fd76848d46bcaf5123c1be3a4eb01da0bdcd78de Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 20 Jan 2019 18:49:42 +0100
Subject: [PATCH] Fixing web tests: Changing jetty module version. Increasing
 some timeouts.

---
 archiva-modules/archiva-web/archiva-webapp-test/pom.xml      | 5 ++++-
 .../org/apache/archiva/web/test/WebDriverBrowseTest.java     | 2 +-
 .../test/java/org/apache/archiva/web/test/WebDriverTest.java | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 764d2d78e..61a586c6d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -560,7 +560,7 @@
           <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>9.4.5.v20170502</version>
+            <version>${jetty.version}</version>
             <configuration>
               <stopKey>archivastop</stopKey>
               <stopPort>${container.stop.port}</stopPort>
@@ -568,6 +568,9 @@
               <httpConnector>
                 <port>${container.http.port}</port>
               </httpConnector>
+              <supportedPackagings>
+                <supportedPackaging>pom</supportedPackaging>
+              </supportedPackagings>
             </configuration>
             <dependencies>
               <dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
index e33f7df8c..dc2e2d8c7 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
@@ -90,7 +90,7 @@ public class WebDriverBrowseTest
         goTo( url );
 
         // wait until topbar-menu-container is feeded
-        await().atMost( 5, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
+        await().atMost( 10, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
         await().atMost( 10, TimeUnit.SECONDS).untilPredicate( (fl) -> el("#create-admin-link-a").conditions().clickable() ||
             el("#login-link-a").conditions().clickable()
         );
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
index 0fb067468..ee0a12f6e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
@@ -82,7 +82,7 @@ public class WebDriverTest
 
         // wait until topbar-menu-container is feeded
         //await().atMost(20, TimeUnit.SECONDS).until($("#topbar-menu")).present();
-        await().untilPredicate((fl) ->$("#topbar-menu").present());
+        await().atMost( 10, TimeUnit.SECONDS).untilPredicate((fl) ->$("#topbar-menu").present());
         await().atMost( 10, TimeUnit.SECONDS).untilPredicate( ( fl) -> el("#create-admin-link-a").conditions().clickable() ||
             el("#login-link-a").conditions().clickable()
         );
-- 
2.39.5