Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2013-08-05 15:47:24 +0000
committerJoakim Erdfelt2013-08-05 15:47:24 +0000
commite2d872fcc74b002381a733e4089601b668639547 (patch)
tree2555408113528f1d09d22dffd9bcb22c123e723c /pom.xml
parente15d83e0615a557bf4b345e50ce71059526344a6 (diff)
parent432964cf5fc669fe86fded615ce492e0c3c62d95 (diff)
downloadorg.eclipse.jetty.project-e2d872fcc74b002381a733e4089601b668639547.tar.gz
org.eclipse.jetty.project-e2d872fcc74b002381a733e4089601b668639547.tar.xz
org.eclipse.jetty.project-e2d872fcc74b002381a733e4089601b668639547.zip
Merge branch 'jetty-8'
Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java jetty-spdy/spdy-client/pom.xml jetty-spdy/spdy-core/pom.xml jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java pom.xml tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 2869f6c037..ae69c0e2c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.11</version>
</dependency>
-->
<dependency>
@@ -576,17 +576,17 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.2.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.2.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
+ <version>1.9.5</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>

Back to the top