diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-12-07 16:49:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 16:49:13 +0200 |
| commit | f022daaa8d359260e65e436459001526d89c3bd6 (patch) | |
| tree | 681b00447f06916331ee4fea235141beb2b4c513 | |
| parent | c6dc21e5a0134add1da82b656cac4e17bae207c4 (diff) | |
| download | vaadin-framework-f022daaa8d359260e65e436459001526d89c3bd6.tar.gz vaadin-framework-f022daaa8d359260e65e436459001526d89c3bd6.zip | |
Force correct Selenium version for Spring Boot test (#10421)
| -rw-r--r-- | test/pom.xml | 35 | ||||
| -rw-r--r-- | test/spring-boot-subcontext/pom.xml | 3 | ||||
| -rw-r--r-- | test/spring-boot/pom.xml | 3 |
3 files changed, 37 insertions, 4 deletions
diff --git a/test/pom.xml b/test/pom.xml index 91aedf5f04..375581dc54 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -18,6 +18,8 @@ <failOnMissingWebXml>false</failOnMissingWebXml> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <spring.boot.version>1.5.9.RELEASE</spring.boot.version> + <selenium.version>3.4.0</selenium.version> <!-- Don't care about coding style for tests --> <sonar.skip>true</sonar.skip> @@ -62,6 +64,39 @@ <artifactId>junit</artifactId> <version>4.12</version> </dependency> + + <!-- Override Selenium version from Spring Boot --> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + <version>${selenium.version}</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-chrome-driver</artifactId> + <version>${selenium.version}</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-server</artifactId> + <version>${selenium.version}</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + <version>${selenium.version}</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-remote-driver</artifactId> + <version>${selenium.version}</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> diff --git a/test/spring-boot-subcontext/pom.xml b/test/spring-boot-subcontext/pom.xml index d864c6cba9..08a5fecae3 100644 --- a/test/spring-boot-subcontext/pom.xml +++ b/test/spring-boot-subcontext/pom.xml @@ -18,7 +18,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - <spring.boot.version>1.4.2.RELEASE</spring.boot.version> <jetty.skip>true</jetty.skip> </properties> @@ -45,7 +44,7 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> + <artifactId>spring-boot-dependencies</artifactId> <type>pom</type> <scope>import</scope> <version>${spring.boot.version}</version> diff --git a/test/spring-boot/pom.xml b/test/spring-boot/pom.xml index 8244ca9cc0..d5a5b58210 100644 --- a/test/spring-boot/pom.xml +++ b/test/spring-boot/pom.xml @@ -18,7 +18,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - <spring.boot.version>1.5.1.RELEASE</spring.boot.version> <jetty.skip>true</jetty.skip> </properties> @@ -45,7 +44,7 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> + <artifactId>spring-boot-dependencies</artifactId> <type>pom</type> <scope>import</scope> <version>${spring.boot.version}</version> |