From eaa5bf545bdb9dace0276dea771128db911a866b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Nov 2020 13:13:00 +0200 Subject: [PATCH] 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] * Merge branch 'master' into dependabot/maven/jetty.version-9.4.34.v20201102 * Test fixes --- pom.xml | 2 +- test/pom.xml | 2 +- .../tests/applicationservlet/NoApplicationClassTest.java | 2 +- .../com/vaadin/tests/components/ui/InvalidViewportTest.java | 5 +++-- .../com/vaadin/tests/requesthandlers/AppResource404Test.java | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c3e3763186..9d94f90c94 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ ${project.build.directory}/dependency-unpack - 9.4.17.v20190418 + 9.4.34.v20201102 8 diff --git a/test/pom.xml b/test/pom.xml index 0ead58af3b..8282936ca2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -11,7 +11,7 @@ 1.8 1.8 - 9.3.7.v20160115 + 9.4.34.v20201102 2.1.1 ${project.version} ${vaadin.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 d6c685d418..7beb0607b1 100644 --- 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 62e39f35fb..b0d5727f68 100644 --- 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 d46b5d164a..be9d4764c4 100644 --- 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 -- 2.39.5