diff options
| author | Leif Åstrand <leif@vaadin.com> | 2016-05-30 16:11:09 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2016-05-30 16:17:58 +0300 |
| commit | 72c067a2d1913642b4cda591c2f76ad87d7279cb (patch) | |
| tree | efa5cbc8ed5fecdd97bb248fa7077732e9b44769 /uitest/pom.xml | |
| parent | ee5584d49fdd4ea3e5662f5a641c4728c160fa1d (diff) | |
| download | vaadin-framework-72c067a2d1913642b4cda591c2f76ad87d7279cb.tar.gz vaadin-framework-72c067a2d1913642b4cda591c2f76ad87d7279cb.zip | |
Move Jetty 9.3 before vaadin-* on the classpath
Without this patch, Eclipse might try to use Jetty 8.1 from
vaadin-client-compiler instead of using the intended version.
Change-Id: Ib9b980bb3ed5e3e892733cf7667f44c015779a13
Diffstat (limited to 'uitest/pom.xml')
| -rw-r--r-- | uitest/pom.xml | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/uitest/pom.xml b/uitest/pom.xml index 374600b196..fadca2f028 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -54,6 +54,45 @@ <scope>provided</scope> </dependency> + <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> + <!-- Jetty before vaadin-* on the classpath to make Eclipse use the right version --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-proxy</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency> @@ -116,43 +155,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-proxy</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.11</version> |