diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-05-19 13:47:37 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-05-20 08:42:19 +0000 |
| commit | 6fa62acf8db8c2c2c62aa5efec4b2c29cd115e07 (patch) | |
| tree | 96d21d17ae2f3404f49d124af13b7385b2686615 /uitest/pom.xml | |
| parent | aa0816ce6e573e91a8bbe5e5df4aca5a800db54c (diff) | |
| download | vaadin-framework-6fa62acf8db8c2c2c62aa5efec4b2c29cd115e07.tar.gz vaadin-framework-6fa62acf8db8c2c2c62aa5efec4b2c29cd115e07.zip | |
Update Jetty version in uitest
Change-Id: I74300ea0724be1e56ea94d3f1327f49b05a09a87
Diffstat (limited to 'uitest/pom.xml')
| -rw-r--r-- | uitest/pom.xml | 57 |
1 files changed, 12 insertions, 45 deletions
diff --git a/uitest/pom.xml b/uitest/pom.xml index 8b87953f7d..c08cee171f 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -11,7 +11,7 @@ <name>vaadin-uitest</name> <packaging>war</packaging> <properties> - <jetty.version>8.1.12.v20130726</jetty.version> + <jetty.version>9.3.9.v20160517</jetty.version> <skip.uitest.deployment>true</skip.uitest.deployment> </properties> @@ -119,12 +119,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> <scope>provided</scope> </dependency> <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> @@ -132,64 +126,32 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> <version>${jetty.version}</version> - - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> <scope>provided</scope> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-proxy</artifactId> <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> <scope>provided</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -227,7 +189,7 @@ <groupId>com.vaadin</groupId> <artifactId>vaadin-testbench</artifactId> <version>4.0.3</version> - <scope>test</scope> + <scope>test</scope> </dependency> <!-- This should be removed once tests have been updated to use lang3 --> <dependency> @@ -276,9 +238,14 @@ </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <version>${jetty.version}</version> + <configuration> + <httpConnector> + <port>8888</port> + </httpConnector> + </configuration> </plugin> <plugin> |