Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2011-01-28 18:58:47 +0000
committerJoakim Erdfelt2011-01-28 18:58:47 +0000
commitacc4f230fc926f5d9cbee5a23c7535ce46238387 (patch)
tree106cfaf4585a03b6d9854c67f133b51ad344c527 /pom.xml
parentdd7511a72107a54d219a8076d5b6154679c9c4ea (diff)
downloadorg.eclipse.jetty.project-acc4f230fc926f5d9cbee5a23c7535ce46238387.tar.gz
org.eclipse.jetty.project-acc4f230fc926f5d9cbee5a23c7535ce46238387.tar.xz
org.eclipse.jetty.project-acc4f230fc926f5d9cbee5a23c7535ce46238387.zip
Merging back /branches/jetty-bug-296978 revs 2674:HEAD
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2709 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml17
1 files changed, 11 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index a05c1c6161..728962eb60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
<javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version>
<javax-transaction-version>1.1.1</javax-transaction-version>
<jetty.url>http://www.eclipse.org/jetty</jetty.url>
- <junit-version>3.8.2</junit-version>
<junit4-version>4.8.1</junit4-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j-version>1.5.11</slf4j-version>
@@ -245,6 +244,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<targetJdk>1.5</targetJdk>
<rulesets>
@@ -255,10 +255,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
</plugin>
</plugins>
</reporting>
- <!--
<repositories>
<repository>
<snapshots>
@@ -269,7 +269,6 @@
<url>http://oss.sonatype.org/content/groups/jetty</url>
</repository>
</repositories>
- -->
<modules>
<module>jetty-util</module>
<module>jetty-jmx</module>
@@ -317,9 +316,9 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit-version}</version>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -351,6 +350,12 @@
<artifactId>activation</artifactId>
<version>${javax-activation-version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit4-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<!--

Back to the top