Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2013-02-27 17:23:40 +0000
committerSimone Bordet2013-02-27 17:23:40 +0000
commit9ec88ef1c99769368dd45ded5757dde935460920 (patch)
tree4a4ec2a0124f3a3c06a6c06d2be52f2cb3a01193 /jetty-servlets/pom.xml
parentc4af34d4e1f92752234087e809cfa08a6947690d (diff)
parentf28bd1d010902717ec1c56f27c5e3529021ed02d (diff)
downloadorg.eclipse.jetty.project-9ec88ef1c99769368dd45ded5757dde935460920.tar.gz
org.eclipse.jetty.project-9ec88ef1c99769368dd45ded5757dde935460920.tar.xz
org.eclipse.jetty.project-9ec88ef1c99769368dd45ded5757dde935460920.zip
Merged branch 'jetty-8'.
Diffstat (limited to 'jetty-servlets/pom.xml')
-rw-r--r--jetty-servlets/pom.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index da60cb69a2..cf1e2af48e 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -85,8 +85,20 @@
<scope>provided</scope>
</dependency>
<dependency>
+<<<<<<< HEAD
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
+=======
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>test-jetty-servlet</artifactId>
+ <version>${project.version}</version>
+>>>>>>> jetty-8
<scope>test</scope>
</dependency>
</dependencies>

Back to the top