Bump jetty.version from 9.4.17.v20190418 to 9.4.34.v20201102 (#12149)

* Bump jetty.version from 9.4.17.v20190418 to 9.4.34.v20201102

Bumps `jetty.version` from 9.4.17.v20190418 to 9.4.34.v20201102.

Updates `jetty-server` from 9.4.17.v20190418 to 9.4.34.v20201102
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.17.v20190418...jetty-9.4.34.v20201102)

Updates `jetty-servlets` from 9.4.17.v20190418 to 9.4.34.v20201102
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.17.v20190418...jetty-9.4.34.v20201102)

Updates `websocket-server` from 9.4.17.v20190418 to 9.4.34.v20201102

Updates `jetty-webapp` from 9.4.17.v20190418 to 9.4.34.v20201102
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.17.v20190418...jetty-9.4.34.v20201102)

Updates `jetty-util` from 9.4.17.v20190418 to 9.4.34.v20201102
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.17.v20190418...jetty-9.4.34.v20201102)

Updates `jetty-proxy` from 9.4.17.v20190418 to 9.4.34.v20201102
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.17.v20190418...jetty-9.4.34.v20201102)

Updates `jetty-maven-plugin` from 9.4.17.v20190418 to 9.4.34.v20201102
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.17.v20190418...jetty-9.4.34.v20201102)

Signed-off-by: dependabot[bot] <support@github.com>
* Merge branch 'master' into dependabot/maven/jetty.version-9.4.34.v20201102

* Test fixes

diff --git a/pom.xml b/pom.xml
index c3e376318620fe615f0f40c21a6b2b1e1106c6a8..9d94f90c94809c40c0cf75ca3068cc41fb323c17 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <!-- Dependency unpack directory -->
         <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
  
-        <jetty.version>9.4.17.v20190418</jetty.version>
+        <jetty.version>9.4.34.v20201102</jetty.version>
 
         <!-- Sonar properties -->
         <sonar.java.source>8</sonar.java.source>

diff --git a/test/pom.xml b/test/pom.xml
index 0ead58af3b757919e9b6ac11042fee917ad6cb87..8282936ca2b736cda261ed2dae7d18599fe3b6e8 100644 (file)
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <jetty.version>9.3.7.v20160115</jetty.version>
+        <jetty.version>9.4.34.v20201102</jetty.version>
         <phantomjs.version>2.1.1</phantomjs.version>
         <vaadin.version>${project.version}</vaadin.version>
         <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>

diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
index d6c685d418ca7e3b502f7aee126878a3b47f6109..7beb0607b1abc539ce491c1b6220a0f7e3ede8f5 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
@@ -12,7 +12,7 @@ public class NoApplicationClassTest extends SingleBrowserTest {
     @Test
     public void testInvalidApplicationClass() {
         openTestURL();
-        String exceptionMessage = getDriver().findElement(By.xpath("//pre[2]"))
+        String exceptionMessage = getDriver().findElement(By.xpath("//pre[1]"))
                 .getText();
         String expected = "ServletException: java.lang.ClassNotFoundException: ClassThatIsNotPresent";
         assertTrue(String.format(

diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
index 62e39f35fba7d1a684e18c8bb4ff29eaf301dc58..b0d5727f68786812862a093180cd89cf2914fb7c 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.ui;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.openqa.selenium.By;
@@ -16,7 +16,8 @@ public class InvalidViewportTest extends SingleBrowserTest {
 
         WebElement heading = findElement(By.tagName("h2"));
 
-        assertEquals("HTTP ERROR 500", heading.getText());
+        assertTrue("Unexpected heading: " + heading.getText(),
+                heading.getText().startsWith("HTTP ERROR 500"));
     }
 
 }

diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
index d46b5d164a4bdc2fb29ff56a2747afc5942e0209..be9d4764c4d9d028026efd90b27df83a3a50bf27 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
@@ -39,7 +39,10 @@ public class AppResource404Test extends MultiBrowserTest {
         assertTrue("Page does not contain the given text",
                 driver.getPageSource().contains("HTTP ERROR 404"));
         assertTrue("Page does not contain the given text",
-                driver.getPageSource().contains("Problem accessing /run/APP/"));
+                driver.getPageSource().contains("/run/APP/"));
+        assertTrue("Page does not contain the given text",
+                driver.getPageSource().contains(
+                        "Request was not handled by any registered handler."));
     }
 
     @Test