From d143906f8ce3ac7142acc4340f8280061a505936 Mon Sep 17 00:00:00 2001 From: Vaadin Bot Date: Thu, 26 May 2022 09:28:10 +0200 Subject: [PATCH] test: Use WebDriverManager to manage chromedriver (#12897) (CP: 2.8) (#13801) (#13866) --- flow-test-util/pom.xml | 35 ++++++++ .../flow/testutil/ChromeDriverLocator.java | 81 ++++--------------- flow-tests/pom.xml | 32 -------- flow-tests/servlet-containers/pom.xml | 31 ------- .../test-reusable-as-parent/pom.xml | 38 +-------- .../test-theme-component-live-reload/pom.xml | 37 +-------- .../test-theme-live-reload/pom.xml | 37 +-------- .../test-theme-reusable/pom.xml | 38 +-------- .../test-theme-switch-live-reload/pom.xml | 37 +-------- flow-tests/test-custom-route-registry/pom.xml | 37 +-------- flow-tests/test-dev-mode/pom.xml | 37 +-------- .../test-embedding-application-theme/pom.xml | 37 +-------- .../pom.xml | 33 -------- .../test-embedding-generic/pom.xml | 40 +-------- .../pom.xml | 34 -------- .../test-embedding-production-mode/pom.xml | 37 +-------- .../test-embedding-reusable-theme/pom.xml | 37 +-------- .../pom.xml | 34 -------- .../test-embedding-theme-variant/pom.xml | 37 +-------- .../pom.xml | 35 -------- flow-tests/test-live-reload/pom.xml | 37 +-------- flow-tests/test-lumo-theme/pom.xml | 31 ------- flow-tests/test-material-theme/pom.xml | 31 ------- flow-tests/test-memory-leaks/pom.xml | 36 +-------- flow-tests/test-misc/pom-bower.xml | 34 -------- flow-tests/test-misc/pom.xml | 37 +-------- flow-tests/test-mixed/pom-bower-devmode.xml | 37 +-------- .../test-mixed/pom-bower-production.xml | 34 -------- flow-tests/test-mixed/pom-npm-production.xml | 37 +-------- flow-tests/test-mixed/pom-npm.xml | 34 -------- flow-tests/test-mixed/pom-pnpm-production.xml | 35 +------- flow-tests/test-mixed/pom.xml | 37 +-------- flow-tests/test-multi-war/deployment/pom.xml | 35 +------- flow-tests/test-no-root-context/pom.xml | 34 -------- flow-tests/test-no-theme/pom.xml | 37 +-------- .../test-default-theme/pom.xml | 34 -------- .../pom-devmode.xml | 43 ---------- .../pom-prod-fallback.xml | 47 +---------- .../pom-production.xml | 47 +---------- .../pom.xml | 47 +---------- .../test-npm-general/pom.xml | 47 +---------- .../test-npm-no-buildmojo/pom.xml | 44 ---------- .../test-npm-performance-regression/pom.xml | 49 +---------- flow-tests/test-pwa/pom.xml | 37 +-------- flow-tests/test-root-context/pom.xml | 37 +-------- flow-tests/test-root-ui-context/pom.xml | 36 +-------- flow-tests/test-router-custom-context/pom.xml | 36 +-------- flow-tests/test-servlet/pom.xml | 36 +-------- flow-tests/test-subcontext/pom.xml | 34 -------- flow-tests/test-themes-legacy/pom-npm.xml | 37 +-------- flow-tests/test-themes-legacy/pom.xml | 33 -------- flow-tests/test-themes/pom.xml | 33 -------- pom.xml | 15 ++-- 53 files changed, 96 insertions(+), 1886 deletions(-) diff --git a/flow-test-util/pom.xml b/flow-test-util/pom.xml index 748b75e0080..efc07f3f836 100644 --- a/flow-test-util/pom.xml +++ b/flow-test-util/pom.xml @@ -32,6 +32,41 @@ vaadin-testbench-core ${testbench.version} + + io.github.bonigarcia + webdrivermanager + 5.1.1 + + + com.fasterxml.jackson.core + jackson-databind + + + com.google.guava + guava + + + org.bouncycastle + bcpg-jdk15on + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + + + com.google.guava + guava + ${guava.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + junit diff --git a/flow-test-util/src/main/java/com/vaadin/flow/testutil/ChromeDriverLocator.java b/flow-test-util/src/main/java/com/vaadin/flow/testutil/ChromeDriverLocator.java index 0c9e5995cf3..e2c92e11890 100644 --- a/flow-test-util/src/main/java/com/vaadin/flow/testutil/ChromeDriverLocator.java +++ b/flow-test-util/src/main/java/com/vaadin/flow/testutil/ChromeDriverLocator.java @@ -16,94 +16,47 @@ package com.vaadin.flow.testutil; -import java.io.IOException; +import java.io.File; import java.io.UncheckedIOException; import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.List; -import java.util.Locale; -import java.util.Optional; import java.util.function.BiPredicate; -import java.util.stream.Collectors; + +import io.github.bonigarcia.wdm.WebDriverManager; /** - * Locates chromedriver binary in the project and sets its valu + * Locates a chromedriver binary. * * @author Vaadin Ltd * @since 1.0. */ final class ChromeDriverLocator { private static final String WEBDRIVER_CHROME_DRIVER = "webdriver.chrome.driver"; - private static final String CHROMEDRIVER_NAME_PART = "chromedriver"; - // examples: driver\windows\googlechrome\64bit\chromedriver.exe - private static final int MAX_DRIVER_SEARCH_DEPTH = 4; - private ChromeDriverLocator() {} + private ChromeDriverLocator() { + } /** * Fills {@link ChromeDriverLocator#WEBDRIVER_CHROME_DRIVER} system property * with chromedriver path, does not override already existing value. - * - * @throws UncheckedIOException - * on io exceptions of the - * {@link Files#find(Path, int, BiPredicate, FileVisitOption...)} - * method */ static void fillEnvironmentProperty() { - if (System.getProperty(WEBDRIVER_CHROME_DRIVER) == null) { - Optional.ofNullable(getDriverLocation()) - .ifPresent(driverLocation -> System.setProperty( - WEBDRIVER_CHROME_DRIVER, driverLocation)); - } - } - - private static String getDriverLocation() { - Path driverDirectory = Paths.get("../../driver/"); - if (!driverDirectory.toFile().isDirectory()) { - System.out.println(String.format( - "Could not find driver directory: %s", driverDirectory)); - return null; - } - - List driverPaths = getDriverPaths(driverDirectory); - - if (driverPaths.isEmpty()) { - System.out.println("No " + CHROMEDRIVER_NAME_PART + " found at \"" - + driverDirectory.toAbsolutePath() + "\"\n" - + " Verify that the path is correct and that driver-binary-downloader-maven-plugin has been run at least once."); - return null; + if (AbstractTestBenchTest.USE_HUB) { + return; } - if (driverPaths.size() > 1) { - System.out.println(String.format( - "Have found multiple driver paths, using the first one from the list: %s", - driverPaths)); + String chromedriverProperty = System + .getProperty(WEBDRIVER_CHROME_DRIVER); + if (chromedriverProperty == null + || !new File(chromedriverProperty).exists()) { + // This sets the same property + WebDriverManager.chromedriver().setup(); + } else { + System.out + .println("Using chromedriver from " + chromedriverProperty); } - return driverPaths.get(0).toAbsolutePath().toString(); - - } - private static List getDriverPaths(Path driverDirectory) { - List driverPaths; - try { - driverPaths = Files - .find(driverDirectory, MAX_DRIVER_SEARCH_DEPTH, - ChromeDriverLocator::isChromeDriver) - .collect(Collectors.toList()); - } catch (IOException e) { - throw new UncheckedIOException("Error trying to locate " - + CHROMEDRIVER_NAME_PART + " binary", e); - } - return driverPaths; } - private static boolean isChromeDriver(Path path, - BasicFileAttributes attributes) { - return attributes.isRegularFile() - && path.toString().toLowerCase(Locale.getDefault()) - .contains(CHROMEDRIVER_NAME_PART); - } } diff --git a/flow-tests/pom.xml b/flow-tests/pom.xml index 0de061d7e63..a0e359fc54b 100644 --- a/flow-tests/pom.xml +++ b/flow-tests/pom.xml @@ -158,38 +158,6 @@ - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.lazerycode.selenium - - - driver-binary-downloader-maven-plugin - - - [${driver.binary.downloader.maven.plugin.version},) - - - selenium - - - - - - - - - - org.sonatype.plugins nexus-staging-maven-plugin diff --git a/flow-tests/servlet-containers/pom.xml b/flow-tests/servlet-containers/pom.xml index c2b709fae91..247a13e78f8 100644 --- a/flow-tests/servlet-containers/pom.xml +++ b/flow-tests/servlet-containers/pom.xml @@ -105,37 +105,6 @@ felix-jetty - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - diff --git a/flow-tests/test-application-theme/test-reusable-as-parent/pom.xml b/flow-tests/test-application-theme/test-reusable-as-parent/pom.xml index 9893c82e2c7..135f5b77faf 100644 --- a/flow-tests/test-application-theme/test-reusable-as-parent/pom.xml +++ b/flow-tests/test-application-theme/test-reusable-as-parent/pom.xml @@ -1,7 +1,5 @@ - + test-application-theme com.vaadin @@ -63,38 +61,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-application-theme/test-theme-component-live-reload/pom.xml b/flow-tests/test-application-theme/test-theme-component-live-reload/pom.xml index a5319f12758..c2d0e6251b8 100644 --- a/flow-tests/test-application-theme/test-theme-component-live-reload/pom.xml +++ b/flow-tests/test-application-theme/test-theme-component-live-reload/pom.xml @@ -1,7 +1,5 @@ - + test-application-theme com.vaadin @@ -86,37 +84,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-application-theme/test-theme-live-reload/pom.xml b/flow-tests/test-application-theme/test-theme-live-reload/pom.xml index 2357e540e0b..0eef480f748 100644 --- a/flow-tests/test-application-theme/test-theme-live-reload/pom.xml +++ b/flow-tests/test-application-theme/test-theme-live-reload/pom.xml @@ -1,7 +1,5 @@ - + test-application-theme com.vaadin @@ -80,37 +78,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-application-theme/test-theme-reusable/pom.xml b/flow-tests/test-application-theme/test-theme-reusable/pom.xml index 9fea75d12f6..bd52aefd394 100644 --- a/flow-tests/test-application-theme/test-theme-reusable/pom.xml +++ b/flow-tests/test-application-theme/test-theme-reusable/pom.xml @@ -1,7 +1,5 @@ - + test-application-theme com.vaadin @@ -63,38 +61,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-application-theme/test-theme-switch-live-reload/pom.xml b/flow-tests/test-application-theme/test-theme-switch-live-reload/pom.xml index 5a511652be5..ee3f42f91f1 100644 --- a/flow-tests/test-application-theme/test-theme-switch-live-reload/pom.xml +++ b/flow-tests/test-application-theme/test-theme-switch-live-reload/pom.xml @@ -1,7 +1,5 @@ - + test-application-theme com.vaadin @@ -87,37 +85,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-custom-route-registry/pom.xml b/flow-tests/test-custom-route-registry/pom.xml index e29be19a295..57cea832ae8 100644 --- a/flow-tests/test-custom-route-registry/pom.xml +++ b/flow-tests/test-custom-route-registry/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -53,37 +51,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-dev-mode/pom.xml b/flow-tests/test-dev-mode/pom.xml index 28bb4bedf22..835bd91be72 100644 --- a/flow-tests/test-dev-mode/pom.xml +++ b/flow-tests/test-dev-mode/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -67,38 +66,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-application-theme/pom.xml b/flow-tests/test-embedding/test-embedding-application-theme/pom.xml index c8923bc7df6..7a2753de73f 100644 --- a/flow-tests/test-embedding/test-embedding-application-theme/pom.xml +++ b/flow-tests/test-embedding/test-embedding-application-theme/pom.xml @@ -15,9 +15,7 @@ ~ the License. --> - + test-embedding com.vaadin @@ -69,37 +67,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-generic-compatibility/pom.xml b/flow-tests/test-embedding/test-embedding-generic-compatibility/pom.xml index 88ead1ed38e..688b27e79a5 100644 --- a/flow-tests/test-embedding/test-embedding-generic-compatibility/pom.xml +++ b/flow-tests/test-embedding/test-embedding-generic-compatibility/pom.xml @@ -86,38 +86,5 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-generic/pom.xml b/flow-tests/test-embedding/test-embedding-generic/pom.xml index 65f04ff1f20..a8df0e7abba 100644 --- a/flow-tests/test-embedding/test-embedding-generic/pom.xml +++ b/flow-tests/test-embedding/test-embedding-generic/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 com.vaadin @@ -54,8 +52,7 @@ jetty-maven-plugin - + /pages ${project.basedir}/../webapp/npm @@ -81,37 +78,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-production-mode-compatibility/pom.xml b/flow-tests/test-embedding/test-embedding-production-mode-compatibility/pom.xml index 342f8956abe..ce2b578b32a 100644 --- a/flow-tests/test-embedding/test-embedding-production-mode-compatibility/pom.xml +++ b/flow-tests/test-embedding/test-embedding-production-mode-compatibility/pom.xml @@ -133,39 +133,5 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-production-mode/pom.xml b/flow-tests/test-embedding/test-embedding-production-mode/pom.xml index 7d76f1e24fc..860bcf35228 100644 --- a/flow-tests/test-embedding/test-embedding-production-mode/pom.xml +++ b/flow-tests/test-embedding/test-embedding-production-mode/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 com.vaadin @@ -100,37 +98,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-reusable-theme/pom.xml b/flow-tests/test-embedding/test-embedding-reusable-theme/pom.xml index 8e8f2c2c154..58d0e63b436 100644 --- a/flow-tests/test-embedding/test-embedding-reusable-theme/pom.xml +++ b/flow-tests/test-embedding/test-embedding-reusable-theme/pom.xml @@ -15,9 +15,7 @@ ~ the License. --> - + test-embedding com.vaadin @@ -86,37 +84,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-theme-variant-compatibility/pom.xml b/flow-tests/test-embedding/test-embedding-theme-variant-compatibility/pom.xml index 0ebdd8aeb51..dc172fcc778 100644 --- a/flow-tests/test-embedding/test-embedding-theme-variant-compatibility/pom.xml +++ b/flow-tests/test-embedding/test-embedding-theme-variant-compatibility/pom.xml @@ -38,39 +38,5 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-embedding/test-embedding-theme-variant/pom.xml b/flow-tests/test-embedding/test-embedding-theme-variant/pom.xml index dac9f8f4702..74faa99c550 100644 --- a/flow-tests/test-embedding/test-embedding-theme-variant/pom.xml +++ b/flow-tests/test-embedding/test-embedding-theme-variant/pom.xml @@ -15,8 +15,7 @@ ~ the License. --> - + 4.0.0 com.vaadin @@ -63,38 +62,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-frontend-production-custom-context/pom.xml b/flow-tests/test-frontend-production-custom-context/pom.xml index 043f52f106c..bd7fccdb4a4 100644 --- a/flow-tests/test-frontend-production-custom-context/pom.xml +++ b/flow-tests/test-frontend-production-custom-context/pom.xml @@ -69,39 +69,4 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-live-reload/pom.xml b/flow-tests/test-live-reload/pom.xml index d84faec467e..18b0b8b8d73 100644 --- a/flow-tests/test-live-reload/pom.xml +++ b/flow-tests/test-live-reload/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -91,37 +89,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-lumo-theme/pom.xml b/flow-tests/test-lumo-theme/pom.xml index 271b33872ca..bcdb4881193 100644 --- a/flow-tests/test-lumo-theme/pom.xml +++ b/flow-tests/test-lumo-theme/pom.xml @@ -108,37 +108,6 @@ - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - diff --git a/flow-tests/test-material-theme/pom.xml b/flow-tests/test-material-theme/pom.xml index 49c2107751c..85ce4d6cb2f 100644 --- a/flow-tests/test-material-theme/pom.xml +++ b/flow-tests/test-material-theme/pom.xml @@ -107,37 +107,6 @@ - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - diff --git a/flow-tests/test-memory-leaks/pom.xml b/flow-tests/test-memory-leaks/pom.xml index a996e0a47bc..ce8dd233ba6 100644 --- a/flow-tests/test-memory-leaks/pom.xml +++ b/flow-tests/test-memory-leaks/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -60,37 +59,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-misc/pom-bower.xml b/flow-tests/test-misc/pom-bower.xml index f69ee396933..6e39555f3ab 100644 --- a/flow-tests/test-misc/pom-bower.xml +++ b/flow-tests/test-misc/pom-bower.xml @@ -66,38 +66,4 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-misc/pom.xml b/flow-tests/test-misc/pom.xml index 39d2218ab7b..546d9023b08 100644 --- a/flow-tests/test-misc/pom.xml +++ b/flow-tests/test-misc/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -62,37 +60,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-mixed/pom-bower-devmode.xml b/flow-tests/test-mixed/pom-bower-devmode.xml index b3abb6f7ef2..0b7a99e4c3d 100644 --- a/flow-tests/test-mixed/pom-bower-devmode.xml +++ b/flow-tests/test-mixed/pom-bower-devmode.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -70,37 +68,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-mixed/pom-bower-production.xml b/flow-tests/test-mixed/pom-bower-production.xml index bc07b6851c5..e01e6929006 100644 --- a/flow-tests/test-mixed/pom-bower-production.xml +++ b/flow-tests/test-mixed/pom-bower-production.xml @@ -88,38 +88,4 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-mixed/pom-npm-production.xml b/flow-tests/test-mixed/pom-npm-production.xml index 5601b875564..5cfe4fc5ebe 100644 --- a/flow-tests/test-mixed/pom-npm-production.xml +++ b/flow-tests/test-mixed/pom-npm-production.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -80,37 +78,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-mixed/pom-npm.xml b/flow-tests/test-mixed/pom-npm.xml index b4ee427a48b..d9a2aa81d0a 100644 --- a/flow-tests/test-mixed/pom-npm.xml +++ b/flow-tests/test-mixed/pom-npm.xml @@ -95,38 +95,4 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-mixed/pom-pnpm-production.xml b/flow-tests/test-mixed/pom-pnpm-production.xml index 9e46741160f..4435f13e225 100644 --- a/flow-tests/test-mixed/pom-pnpm-production.xml +++ b/flow-tests/test-mixed/pom-pnpm-production.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -123,36 +121,5 @@ - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - diff --git a/flow-tests/test-mixed/pom.xml b/flow-tests/test-mixed/pom.xml index 75d17de20dc..fdcf37fe3af 100644 --- a/flow-tests/test-mixed/pom.xml +++ b/flow-tests/test-mixed/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -93,37 +91,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-multi-war/deployment/pom.xml b/flow-tests/test-multi-war/deployment/pom.xml index cfb5f28f677..91887437b22 100644 --- a/flow-tests/test-multi-war/deployment/pom.xml +++ b/flow-tests/test-multi-war/deployment/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -46,37 +46,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-no-root-context/pom.xml b/flow-tests/test-no-root-context/pom.xml index ef9aac5ea68..c3ea0787287 100644 --- a/flow-tests/test-no-root-context/pom.xml +++ b/flow-tests/test-no-root-context/pom.xml @@ -77,38 +77,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-no-theme/pom.xml b/flow-tests/test-no-theme/pom.xml index 305abe6d74e..79002c56d7e 100644 --- a/flow-tests/test-no-theme/pom.xml +++ b/flow-tests/test-no-theme/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -103,38 +102,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-default-theme/pom.xml b/flow-tests/test-npm-only-features/test-default-theme/pom.xml index 9a4f15a92b9..30d2c9b68cb 100644 --- a/flow-tests/test-npm-only-features/test-default-theme/pom.xml +++ b/flow-tests/test-npm-only-features/test-default-theme/pom.xml @@ -73,38 +73,4 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-devmode.xml b/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-devmode.xml index 1034ed668b2..d8f37c4de4f 100644 --- a/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-devmode.xml +++ b/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-devmode.xml @@ -91,47 +91,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-prod-fallback.xml b/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-prod-fallback.xml index 0d9d933f884..27c8b1c941c 100644 --- a/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-prod-fallback.xml +++ b/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-prod-fallback.xml @@ -15,9 +15,7 @@ ~ the License. --> - + flow-test-npm-only-features com.vaadin @@ -100,47 +98,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-production.xml b/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-production.xml index 9c39d6a6cfa..6523f922a77 100644 --- a/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-production.xml +++ b/flow-tests/test-npm-only-features/test-npm-bytecode-scanning/pom-production.xml @@ -15,9 +15,7 @@ ~ the License. --> - + flow-test-npm-only-features com.vaadin @@ -100,47 +98,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-custom-frontend-directory/pom.xml b/flow-tests/test-npm-only-features/test-npm-custom-frontend-directory/pom.xml index 7b668113f26..85cc631f544 100644 --- a/flow-tests/test-npm-only-features/test-npm-custom-frontend-directory/pom.xml +++ b/flow-tests/test-npm-only-features/test-npm-custom-frontend-directory/pom.xml @@ -15,9 +15,7 @@ ~ the License. --> - + flow-test-npm-only-features com.vaadin @@ -93,47 +91,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-general/pom.xml b/flow-tests/test-npm-only-features/test-npm-general/pom.xml index 918e3959e95..fa14d2331e4 100644 --- a/flow-tests/test-npm-only-features/test-npm-general/pom.xml +++ b/flow-tests/test-npm-only-features/test-npm-general/pom.xml @@ -15,9 +15,7 @@ ~ the License. --> - + com.vaadin flow-test-npm-only-features @@ -115,47 +113,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-no-buildmojo/pom.xml b/flow-tests/test-npm-only-features/test-npm-no-buildmojo/pom.xml index 5215a6065ee..83cdfb5fa05 100644 --- a/flow-tests/test-npm-only-features/test-npm-no-buildmojo/pom.xml +++ b/flow-tests/test-npm-only-features/test-npm-no-buildmojo/pom.xml @@ -128,48 +128,4 @@ - - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-npm-only-features/test-npm-performance-regression/pom.xml b/flow-tests/test-npm-only-features/test-npm-performance-regression/pom.xml index d7e2cac8be2..c2dde0393d8 100644 --- a/flow-tests/test-npm-only-features/test-npm-performance-regression/pom.xml +++ b/flow-tests/test-npm-only-features/test-npm-performance-regression/pom.xml @@ -1,7 +1,5 @@ - + flow-test-npm-only-features com.vaadin @@ -48,7 +46,7 @@ com.google.guava guava - 28.1-jre + ${guava.version} com.google.inject @@ -142,47 +140,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - ${driver.binary.downloader.maven.plugin.version} - - - true - - - ${project.rootdir}/driver - - - ${project.rootdir}/driver_zips - - - ${project.rootdir}/drivers.xml - - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-pwa/pom.xml b/flow-tests/test-pwa/pom.xml index 914734dff63..5e8c724cd95 100644 --- a/flow-tests/test-pwa/pom.xml +++ b/flow-tests/test-pwa/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 flow-tests @@ -70,37 +68,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-root-context/pom.xml b/flow-tests/test-root-context/pom.xml index 53fc9cca884..1118c5559e0 100644 --- a/flow-tests/test-root-context/pom.xml +++ b/flow-tests/test-root-context/pom.xml @@ -29,7 +29,7 @@ flow-test-common ${project.version} - + com.vaadin flow-server-compatibility-mode @@ -105,7 +105,7 @@ - src/main/webapp @@ -164,42 +164,11 @@ - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - productionMode - test.use.browserstack true diff --git a/flow-tests/test-root-ui-context/pom.xml b/flow-tests/test-root-ui-context/pom.xml index 394aef794e1..98d5c5148e8 100644 --- a/flow-tests/test-root-ui-context/pom.xml +++ b/flow-tests/test-root-ui-context/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -62,37 +61,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-router-custom-context/pom.xml b/flow-tests/test-router-custom-context/pom.xml index 3f246687a0f..6a8888d7223 100644 --- a/flow-tests/test-router-custom-context/pom.xml +++ b/flow-tests/test-router-custom-context/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -64,38 +63,5 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-servlet/pom.xml b/flow-tests/test-servlet/pom.xml index acd40c3e922..85eb06efcab 100644 --- a/flow-tests/test-servlet/pom.xml +++ b/flow-tests/test-servlet/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -55,37 +54,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-subcontext/pom.xml b/flow-tests/test-subcontext/pom.xml index af778bfb031..715e586c59a 100644 --- a/flow-tests/test-subcontext/pom.xml +++ b/flow-tests/test-subcontext/pom.xml @@ -68,38 +68,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-themes-legacy/pom-npm.xml b/flow-tests/test-themes-legacy/pom-npm.xml index cd1e1176d6c..18d9e34752d 100644 --- a/flow-tests/test-themes-legacy/pom-npm.xml +++ b/flow-tests/test-themes-legacy/pom-npm.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.vaadin @@ -55,38 +54,4 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - - diff --git a/flow-tests/test-themes-legacy/pom.xml b/flow-tests/test-themes-legacy/pom.xml index 121fce315c5..1acce84e6e6 100644 --- a/flow-tests/test-themes-legacy/pom.xml +++ b/flow-tests/test-themes-legacy/pom.xml @@ -67,38 +67,5 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/flow-tests/test-themes/pom.xml b/flow-tests/test-themes/pom.xml index 179351b3e96..dc5c1def1fa 100644 --- a/flow-tests/test-themes/pom.xml +++ b/flow-tests/test-themes/pom.xml @@ -58,38 +58,5 @@ - - - local-run - - - !test.use.hub - - - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - ${driver.binary.downloader.maven.plugin.version} - - true - ${project.rootdir}/driver - ${project.rootdir}/driver_zips - ${project.rootdir}/drivers.xml - - - - pre-integration-test - - selenium - - - - - - - - diff --git a/pom.xml b/pom.xml index bc828500e22..86eae56ca2a 100644 --- a/pom.xml +++ b/pom.xml @@ -90,10 +90,11 @@ 1.7.32 2.6.1 4.5.13 + 2.13.3 + 31.1-jre + 1.70 - 1.0.17 - 1.5 2.22.2 2.22.2 @@ -109,7 +110,7 @@ v8.11.1 6.1.0 - + generatedDeps devDependencies.json @@ -133,7 +134,7 @@ - central @@ -159,7 +160,7 @@ - central @@ -248,7 +249,7 @@ httpclient-osgi ${apache.httpclient.version} - + org.apache.httpcomponents httpclient @@ -542,7 +543,7 @@ 2 - org.eclipse.m2e