Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2012-09-20 18:42:21 +0000
committerJoakim Erdfelt2012-09-20 18:52:59 +0000
commit857498b115138cd34cd48a16c1b956a16e0bdeac (patch)
tree9092e49ecdd76fbd0f6a6e21dc94258599392ce9
parentbe865fa1915b89518e8f87c4f234715d01b9520d (diff)
downloadorg.eclipse.jetty.project-857498b115138cd34cd48a16c1b956a16e0bdeac.tar.gz
org.eclipse.jetty.project-857498b115138cd34cd48a16c1b956a16e0bdeac.tar.xz
org.eclipse.jetty.project-857498b115138cd34cd48a16c1b956a16e0bdeac.zip
Upgrading to junit-dep-4.10.jar (banning junit.jar)
-rw-r--r--example-jetty-embedded/pom.xml5
-rw-r--r--jetty-annotations/pom.xml4
-rwxr-xr-xjetty-ant/pom.xml4
-rw-r--r--jetty-continuation/pom.xml10
-rw-r--r--jetty-http-spi/pom.xml4
-rw-r--r--jetty-io/pom.xml5
-rw-r--r--jetty-jaspi/pom.xml4
-rw-r--r--jetty-jmx/pom.xml4
-rw-r--r--jetty-jndi/pom.xml4
-rw-r--r--jetty-jspc-maven-plugin/pom.xml14
-rw-r--r--jetty-maven-plugin/pom.xml6
-rw-r--r--jetty-monitor/pom.xml5
-rw-r--r--jetty-nosql/pom.xml4
-rw-r--r--jetty-osgi/test-jetty-osgi/pom.xml11
-rw-r--r--jetty-overlay-deployer/pom.xml6
-rw-r--r--jetty-plugins/pom.xml10
-rw-r--r--jetty-plus/pom.xml4
-rw-r--r--jetty-proxy/pom.xml5
-rw-r--r--jetty-rhttp/jetty-rhttp-client/pom.xml5
-rw-r--r--jetty-rhttp/jetty-rhttp-connector/pom.xml5
-rw-r--r--jetty-rhttp/jetty-rhttp-gateway/pom.xml5
-rw-r--r--jetty-rhttp/pom.xml4
-rw-r--r--jetty-servlets/pom.xml5
-rw-r--r--jetty-setuid/jetty-setuid-test/pom.xml5
-rw-r--r--jetty-setuid/libsetuid_linux/pom.xml10
-rw-r--r--jetty-setuid/libsetuid_osx/pom.xml4
-rw-r--r--jetty-spdy/pom.xml8
-rw-r--r--jetty-spdy/spdy-client/pom.xml10
-rw-r--r--jetty-spdy/spdy-core/pom.xml15
-rw-r--r--jetty-spdy/spdy-http-server/pom.xml4
-rw-r--r--jetty-spdy/spdy-server/pom.xml10
-rw-r--r--jetty-spring/pom.xml4
-rw-r--r--jetty-webapp/pom.xml4
-rw-r--r--jetty-websocket/websocket-client/pom.xml2
-rw-r--r--jetty-xml/pom.xml4
-rw-r--r--pom.xml42
-rw-r--r--test-continuation-jetty6/pom.xml4
-rw-r--r--test-jetty-servlet/pom.xml4
-rw-r--r--test-jetty-webapp/pom.xml4
-rw-r--r--tests/test-loginservice/pom.xml10
-rw-r--r--tests/test-sessions/test-hash-sessions/pom.xml10
-rw-r--r--tests/test-sessions/test-jdbc-sessions/pom.xml10
-rw-r--r--tests/test-sessions/test-mongodb-sessions/pom.xml10
43 files changed, 152 insertions, 155 deletions
diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml
index adfeb259a7..deb02f0753 100644
--- a/example-jetty-embedded/pom.xml
+++ b/example-jetty-embedded/pom.xml
@@ -49,10 +49,5 @@
<artifactId>jetty-test-helper</artifactId>
<!-- scope>test</scope-->
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index fc314f3a14..1e5d29b574 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -71,8 +71,8 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
index 411369943f..63e0e12d83 100755
--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -12,8 +12,8 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 720e3039bd..0aa1fd6d1b 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -48,7 +48,7 @@
</execution>
</executions>
<configuration>
- <archive>
+ <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
@@ -64,16 +64,16 @@
</build>
<dependencies>
<dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
<version>3.0.0.v201112011016</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
index 6a07889016..7dc16201b8 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -12,8 +12,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 76dde2062b..1e619bb124 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -26,11 +26,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index b94e1d07cf..8ebcdf9e3c 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -59,8 +59,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 238b040e02..b2389fc411 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -70,8 +70,8 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index cc62d492ce..58dad4b054 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -53,8 +53,8 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index 3775aa0ef3..710ae74caa 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
<executions>
<execution>
<id>exec-plugin-doc</id>
- <phase>generate-sources</phase>
+ <phase>generate-sources</phase>
<goals>
<goal>xdoc</goal>
<goal>helpmojo</goal>
@@ -44,6 +44,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -59,6 +65,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>2.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 030c37410c..d7f5ca1cff 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -80,6 +80,12 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>${pluginToolsVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml
index 27e472de49..229464ea59 100644
--- a/jetty-monitor/pom.xml
+++ b/jetty-monitor/pom.xml
@@ -141,10 +141,5 @@
<artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index 208428c1c2..69cf188d2f 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -66,8 +66,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index daef7de059..b36ae6c4ef 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -146,6 +146,13 @@
<artifactId>pax-exam-junit</artifactId>
<version>${paxexam-version}</version>
<scope>test</scope>
+ <exclusion>
+ <exclusion>
+ <!-- we use junit-dep -->
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusion>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -154,8 +161,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml
index 48f4465b5a..138afc387d 100644
--- a/jetty-overlay-deployer/pom.xml
+++ b/jetty-overlay-deployer/pom.xml
@@ -53,11 +53,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <reporting>
- </reporting>
</project>
diff --git a/jetty-plugins/pom.xml b/jetty-plugins/pom.xml
index 52fdd62e81..0c85e7b10e 100644
--- a/jetty-plugins/pom.xml
+++ b/jetty-plugins/pom.xml
@@ -43,14 +43,8 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.0</version> <!-- TODO: version should be inherited from parent pom.xml -->
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 6fa6539c2b..e16db732a8 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -83,8 +83,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml
index 59451bc622..a2ebe53282 100644
--- a/jetty-proxy/pom.xml
+++ b/jetty-proxy/pom.xml
@@ -54,11 +54,6 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
diff --git a/jetty-rhttp/jetty-rhttp-client/pom.xml b/jetty-rhttp/jetty-rhttp-client/pom.xml
index 8fcf7253b2..f69a1dd853 100644
--- a/jetty-rhttp/jetty-rhttp-client/pom.xml
+++ b/jetty-rhttp/jetty-rhttp-client/pom.xml
@@ -42,8 +42,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-rhttp/jetty-rhttp-connector/pom.xml b/jetty-rhttp/jetty-rhttp-connector/pom.xml
index c507ebd4fd..b11f6be569 100644
--- a/jetty-rhttp/jetty-rhttp-connector/pom.xml
+++ b/jetty-rhttp/jetty-rhttp-connector/pom.xml
@@ -49,8 +49,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/jetty-rhttp/jetty-rhttp-gateway/pom.xml b/jetty-rhttp/jetty-rhttp-gateway/pom.xml
index 5905e02a58..c07956beb3 100644
--- a/jetty-rhttp/jetty-rhttp-gateway/pom.xml
+++ b/jetty-rhttp/jetty-rhttp-gateway/pom.xml
@@ -58,8 +58,9 @@
<artifactId>jetty-client</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/jetty-rhttp/pom.xml b/jetty-rhttp/pom.xml
index 307e73846e..67b8157a73 100644
--- a/jetty-rhttp/pom.xml
+++ b/jetty-rhttp/pom.xml
@@ -97,8 +97,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 470aba4307..d71af33fd2 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -54,11 +54,6 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
diff --git a/jetty-setuid/jetty-setuid-test/pom.xml b/jetty-setuid/jetty-setuid-test/pom.xml
index 84ec87e30c..7ebfbb1d0c 100644
--- a/jetty-setuid/jetty-setuid-test/pom.xml
+++ b/jetty-setuid/jetty-setuid-test/pom.xml
@@ -28,11 +28,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
</dependency>
diff --git a/jetty-setuid/libsetuid_linux/pom.xml b/jetty-setuid/libsetuid_linux/pom.xml
index 0a721973aa..9d8e79b430 100644
--- a/jetty-setuid/libsetuid_linux/pom.xml
+++ b/jetty-setuid/libsetuid_linux/pom.xml
@@ -122,15 +122,15 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty.setuid</groupId>
<artifactId>jetty-setuid-java</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-setuid/libsetuid_osx/pom.xml b/jetty-setuid/libsetuid_osx/pom.xml
index fae0a24289..8adda63207 100644
--- a/jetty-setuid/libsetuid_osx/pom.xml
+++ b/jetty-setuid/libsetuid_osx/pom.xml
@@ -99,8 +99,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index 68712052cd..38b4d64c8b 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -24,6 +24,14 @@
<module>spdy-example-webapp</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml
index 9898c6af02..d3308f6b95 100644
--- a/jetty-spdy/spdy-client/pom.xml
+++ b/jetty-spdy/spdy-client/pom.xml
@@ -57,16 +57,6 @@
<version>${npn.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index d24533be8c..f58d65b73f 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/jetty-spdy/spdy-core/pom.xml
@@ -22,21 +22,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-test-helper</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml
index e388d82acf..9d69f38faa 100644
--- a/jetty-spdy/spdy-http-server/pom.xml
+++ b/jetty-spdy/spdy-http-server/pom.xml
@@ -51,10 +51,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.npn</groupId>
<artifactId>npn-api</artifactId>
<version>${npn.version}</version>
diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml
index 14c2143c92..cf0ae25182 100644
--- a/jetty-spdy/spdy-server/pom.xml
+++ b/jetty-spdy/spdy-server/pom.xml
@@ -67,16 +67,6 @@
<version>${npn.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml
index 30046fd1a6..b2d2988cbb 100644
--- a/jetty-spring/pom.xml
+++ b/jetty-spring/pom.xml
@@ -57,8 +57,8 @@
<version>${spring-version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index ef9f33cc6a..405862448f 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -90,8 +90,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml
index 10098a55ad..be50ef9cee 100644
--- a/jetty-websocket/websocket-client/pom.xml
+++ b/jetty-websocket/websocket-client/pom.xml
@@ -71,6 +71,8 @@
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
</includes>
+ <searchTransitive>true</searchTransitive>
+ <message>The servlet-api dependency is banned in websocket-client as it causes problems in apps that use client only.</message>
</bannedDependencies>
</rules>
</configuration>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 9d37bb5266..e43093a92e 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -53,8 +53,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 4b7890f942..1f6fc312b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,23 @@
<fail>true</fail>
</configuration>
</execution>
+ <execution>
+ <id>ban-junit.jar</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>junit:junit:*:jar</exclude>
+ </excludes>
+ <searchTransitive>true</searchTransitive>
+ <message>We use junit-dep.jar, not junit.jar (as the standard junit.jar aggregates too many 3rd party libs inside of it)</message>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
@@ -489,7 +506,7 @@
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -506,20 +523,39 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
+ <!-- NOTICE: we no longer use junit.jar as it bundles/aggregates too many
+ 3rd party libraries in itself
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
</dependency>
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <version>4.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.8.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml
index d853b66d60..2448370e09 100644
--- a/test-continuation-jetty6/pom.xml
+++ b/test-continuation-jetty6/pom.xml
@@ -23,8 +23,8 @@
</build>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml
index f91afa042c..5375d1df80 100644
--- a/test-jetty-servlet/pom.xml
+++ b/test-jetty-servlet/pom.xml
@@ -15,8 +15,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml
index bfb69ee0d4..7c4e8c1782 100644
--- a/test-jetty-webapp/pom.xml
+++ b/test-jetty-webapp/pom.xml
@@ -187,8 +187,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 178b0cc9a8..36f4be5520 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -58,10 +58,10 @@
<version>10.4.1.3</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index 7b2736f67e..0d3797c7b6 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -65,10 +65,10 @@
<artifactId>test-sessions-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 6287f3d4d7..5c30fbd9e9 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -77,10 +77,10 @@
<version>10.4.1.3</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index db108a97ea..44c3ed9793 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -109,11 +109,11 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>

Back to the top