diff options
| author | Jan Bartel | 2012-11-30 04:45:36 +0000 |
|---|---|---|
| committer | Jan Bartel | 2012-11-30 04:45:36 +0000 |
| commit | c9db4ca8153661175080a9b5bd67ba3da365af8a (patch) | |
| tree | d67a128dd4709ca7d359a43eee6210af1006ec0a /tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml | |
| parent | 2a2215cf0bbdca71d34ee529af0187abb366954f (diff) | |
| parent | b3e11143138401af2309eeb5e56ee52a21490590 (diff) | |
| download | org.eclipse.jetty.project-c9db4ca8153661175080a9b5bd67ba3da365af8a.tar.gz org.eclipse.jetty.project-c9db4ca8153661175080a9b5bd67ba3da365af8a.tar.xz org.eclipse.jetty.project-c9db4ca8153661175080a9b5bd67ba3da365af8a.zip | |
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-proxy/pom.xml
pom.xml
Diffstat (limited to 'tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml')
| -rw-r--r-- | tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml index f28b244357..89b3d0519c 100644 --- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml @@ -22,9 +22,17 @@ </plugins> </build> <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1-b01</version> + </dependency> + +<!-- <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.servlet</artifactId> </dependency> +--> </dependencies> </project> |