From 857498b115138cd34cd48a16c1b956a16e0bdeac Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 20 Sep 2012 11:42:21 -0700 Subject: [PATCH] Upgrading to junit-dep-4.10.jar (banning junit.jar) --- example-jetty-embedded/pom.xml | 5 --- jetty-annotations/pom.xml | 4 +- jetty-ant/pom.xml | 4 +- jetty-continuation/pom.xml | 10 ++--- jetty-http-spi/pom.xml | 4 +- jetty-io/pom.xml | 5 --- jetty-jaspi/pom.xml | 4 +- jetty-jmx/pom.xml | 4 +- jetty-jndi/pom.xml | 4 +- jetty-jspc-maven-plugin/pom.xml | 14 ++++++- jetty-maven-plugin/pom.xml | 6 +++ jetty-monitor/pom.xml | 5 --- jetty-nosql/pom.xml | 4 +- jetty-osgi/test-jetty-osgi/pom.xml | 11 ++++- jetty-overlay-deployer/pom.xml | 6 +-- jetty-plugins/pom.xml | 10 +---- jetty-plus/pom.xml | 4 +- jetty-proxy/pom.xml | 5 --- jetty-rhttp/jetty-rhttp-client/pom.xml | 5 ++- jetty-rhttp/jetty-rhttp-connector/pom.xml | 5 ++- jetty-rhttp/jetty-rhttp-gateway/pom.xml | 5 ++- jetty-rhttp/pom.xml | 4 +- jetty-servlets/pom.xml | 5 --- jetty-setuid/jetty-setuid-test/pom.xml | 5 --- jetty-setuid/libsetuid_linux/pom.xml | 10 ++--- jetty-setuid/libsetuid_osx/pom.xml | 4 +- jetty-spdy/pom.xml | 8 ++++ jetty-spdy/spdy-client/pom.xml | 10 ----- jetty-spdy/spdy-core/pom.xml | 15 ------- jetty-spdy/spdy-http-server/pom.xml | 4 -- jetty-spdy/spdy-server/pom.xml | 10 ----- jetty-spring/pom.xml | 4 +- jetty-webapp/pom.xml | 4 +- jetty-websocket/websocket-client/pom.xml | 2 + jetty-xml/pom.xml | 4 +- pom.xml | 42 +++++++++++++++++-- test-continuation-jetty6/pom.xml | 4 +- test-jetty-servlet/pom.xml | 4 +- test-jetty-webapp/pom.xml | 4 +- tests/test-loginservice/pom.xml | 10 ++--- .../test-sessions/test-hash-sessions/pom.xml | 10 ++--- .../test-sessions/test-jdbc-sessions/pom.xml | 10 ++--- .../test-mongodb-sessions/pom.xml | 10 ++--- 43 files changed, 152 insertions(+), 155 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index adfeb259a71..deb02f0753e 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -49,10 +49,5 @@ jetty-test-helper - - junit - junit - test - diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index fc314f3a14c..1e5d29b5742 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -71,8 +71,8 @@ - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 411369943ff..63e0e12d832 100755 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -12,8 +12,8 @@ - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 720e3039bd5..0aa1fd6d1ba 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -48,7 +48,7 @@ - + ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -64,16 +64,16 @@ - org.eclipse.jetty.orbit + org.eclipse.jetty.orbit javax.servlet 3.0.0.v201112011016 provided - + - org.mortbay.jetty + org.mortbay.jetty jetty-util 6.1.26 provided - + diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 6a07889016e..7dc16201b80 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -12,8 +12,8 @@ - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 76dde2062b0..1e619bb124e 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -26,11 +26,6 @@ mockito-core test - - junit - junit - test - diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index b94e1d07cf4..8ebcdf9e3c2 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -59,8 +59,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 238b040e022..b2389fc411c 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -70,8 +70,8 @@ - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index cc62d492ce3..58dad4b0549 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -53,8 +53,8 @@ - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 3775aa0ef3f..710ae74caa3 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -24,7 +24,7 @@ exec-plugin-doc - generate-sources + generate-sources xdoc helpmojo @@ -44,6 +44,12 @@ org.apache.maven maven-project 2.0.3 + + + junit + junit + + org.apache.maven @@ -59,6 +65,12 @@ org.apache.maven maven-plugin-tools-api 2.0.3 + + + junit + junit + + org.eclipse.jetty diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 030c37410c1..d7f5ca1cffc 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -80,6 +80,12 @@ org.apache.maven.plugin-tools maven-plugin-tools-api ${pluginToolsVersion} + + + junit + junit + + org.eclipse.jetty diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 27e472de49d..229464ea590 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -141,10 +141,5 @@ jetty-test-helper test - - junit - junit - test - diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 208428c1c21..69cf188d2f9 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -66,8 +66,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index daef7de0593..b36ae6c4efc 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -146,6 +146,13 @@ pax-exam-junit ${paxexam-version} test + + + + junit + junit + + org.ops4j.pax.exam @@ -154,8 +161,8 @@ test - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 48f4465b5a2..138afc387da 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -53,11 +53,9 @@ test - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test - - diff --git a/jetty-plugins/pom.xml b/jetty-plugins/pom.xml index 52fdd62e811..0c85e7b10e3 100644 --- a/jetty-plugins/pom.xml +++ b/jetty-plugins/pom.xml @@ -43,14 +43,8 @@ - junit - junit - test - - - org.hamcrest - hamcrest-all - 1.0 + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 6fa6539c2bf..e16db732a8d 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -83,8 +83,8 @@ test - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 59451bc6228..a2ebe532829 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -53,11 +53,6 @@ - - junit - junit - test - org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-rhttp/jetty-rhttp-client/pom.xml b/jetty-rhttp/jetty-rhttp-client/pom.xml index 8fcf7253b2d..f69a1dd853c 100644 --- a/jetty-rhttp/jetty-rhttp-client/pom.xml +++ b/jetty-rhttp/jetty-rhttp-client/pom.xml @@ -42,8 +42,9 @@ provided - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper + test org.eclipse.jetty diff --git a/jetty-rhttp/jetty-rhttp-connector/pom.xml b/jetty-rhttp/jetty-rhttp-connector/pom.xml index c507ebd4fdf..b11f6be5697 100644 --- a/jetty-rhttp/jetty-rhttp-connector/pom.xml +++ b/jetty-rhttp/jetty-rhttp-connector/pom.xml @@ -49,8 +49,9 @@ test - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper + test javax.servlet diff --git a/jetty-rhttp/jetty-rhttp-gateway/pom.xml b/jetty-rhttp/jetty-rhttp-gateway/pom.xml index 5905e02a58c..c07956beb35 100644 --- a/jetty-rhttp/jetty-rhttp-gateway/pom.xml +++ b/jetty-rhttp/jetty-rhttp-gateway/pom.xml @@ -58,8 +58,9 @@ jetty-client - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper + test diff --git a/jetty-rhttp/pom.xml b/jetty-rhttp/pom.xml index 307e73846e6..67b8157a738 100644 --- a/jetty-rhttp/pom.xml +++ b/jetty-rhttp/pom.xml @@ -97,8 +97,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 470aba43077..d71af33fd2a 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -53,11 +53,6 @@ - - junit - junit - test - org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-setuid/jetty-setuid-test/pom.xml b/jetty-setuid/jetty-setuid-test/pom.xml index 84ec87e30c4..7ebfbb1d0cd 100644 --- a/jetty-setuid/jetty-setuid-test/pom.xml +++ b/jetty-setuid/jetty-setuid-test/pom.xml @@ -27,11 +27,6 @@ jetty-setuid-java ${project.version} - - junit - junit - test - org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-setuid/libsetuid_linux/pom.xml b/jetty-setuid/libsetuid_linux/pom.xml index 0a721973aa1..9d8e79b430e 100644 --- a/jetty-setuid/libsetuid_linux/pom.xml +++ b/jetty-setuid/libsetuid_linux/pom.xml @@ -121,16 +121,16 @@ + + org.eclipse.jetty.toolchain + jetty-test-helper + test + org.eclipse.jetty.setuid jetty-setuid-java ${project.version} - - junit - junit - test - diff --git a/jetty-setuid/libsetuid_osx/pom.xml b/jetty-setuid/libsetuid_osx/pom.xml index fae0a24289a..8adda63207c 100644 --- a/jetty-setuid/libsetuid_osx/pom.xml +++ b/jetty-setuid/libsetuid_osx/pom.xml @@ -99,8 +99,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 68712052cdf..38b4d64c8bf 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -24,6 +24,14 @@ spdy-example-webapp + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index 9898c6af020..d3308f6b953 100644 --- a/jetty-spdy/spdy-client/pom.xml +++ b/jetty-spdy/spdy-client/pom.xml @@ -57,16 +57,6 @@ ${npn.version} provided - - junit - junit - test - - - org.hamcrest - hamcrest-all - test - diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index d24533be8c1..f58d65b73f9 100644 --- a/jetty-spdy/spdy-core/pom.xml +++ b/jetty-spdy/spdy-core/pom.xml @@ -21,21 +21,6 @@ jetty-io ${project.version} - - junit - junit - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.hamcrest - hamcrest-all - test - org.mockito mockito-core diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index e388d82acff..9d69f38faa4 100644 --- a/jetty-spdy/spdy-http-server/pom.xml +++ b/jetty-spdy/spdy-http-server/pom.xml @@ -50,10 +50,6 @@ spdy-server ${project.version} - - junit - junit - org.eclipse.jetty.npn npn-api diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index 14c2143c929..cf0ae25182c 100644 --- a/jetty-spdy/spdy-server/pom.xml +++ b/jetty-spdy/spdy-server/pom.xml @@ -67,16 +67,6 @@ ${npn.version} provided - - junit - junit - test - - - org.hamcrest - hamcrest-all - test - diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 30046fd1a66..b2d2988cbb3 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -57,8 +57,8 @@ ${spring-version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index ef9f33cc6ab..405862448fe 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -90,8 +90,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 10098a55ad6..be50ef9cee9 100644 --- a/jetty-websocket/websocket-client/pom.xml +++ b/jetty-websocket/websocket-client/pom.xml @@ -71,6 +71,8 @@ org.mortbay.jetty:servlet-api jetty:servlet-api + true + The servlet-api dependency is banned in websocket-client as it causes problems in apps that use client only. diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 9d37bb52662..e43093a92ea 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -53,8 +53,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/pom.xml b/pom.xml index 4b7890f942c..1f6fc312b83 100644 --- a/pom.xml +++ b/pom.xml @@ -159,6 +159,23 @@ true + + ban-junit.jar + + enforce + + + + + + junit:junit:*:jar + + true + We use junit-dep.jar, not junit.jar (as the standard junit.jar aggregates too many 3rd party libs inside of it) + + + + @@ -489,7 +506,7 @@ org.eclipse.jetty.toolchain jetty-test-helper - 1.8 + 1.9-SNAPSHOT org.slf4j @@ -506,20 +523,39 @@ slf4j-api ${slf4j-version} + + + junit + junit-dep + 4.10 org.hamcrest - hamcrest-all - 1.1 + hamcrest-core + 1.2.1 + + + org.hamcrest + hamcrest-library + 1.2.1 org.mockito mockito-core 1.8.5 + + + junit + junit + + diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml index d853b66d602..2448370e096 100644 --- a/test-continuation-jetty6/pom.xml +++ b/test-continuation-jetty6/pom.xml @@ -23,8 +23,8 @@ - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index f91afa042ca..5375d1df800 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -15,8 +15,8 @@ ${project.version} - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index bfb69ee0d46..7c4e8c1782e 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -187,8 +187,8 @@ test - junit - junit + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 178b0cc9a8c..36f4be5520e 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -58,10 +58,10 @@ 10.4.1.3 test - - junit - junit - test - + + org.eclipse.jetty.toolchain + jetty-test-helper + test + diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index 7b2736f67ea..0d3797c7b61 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -65,10 +65,10 @@ test-sessions-common ${project.version} - - junit - junit - test - + + org.eclipse.jetty.toolchain + jetty-test-helper + test + diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 6287f3d4d75..5c30fbd9e9d 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -77,10 +77,10 @@ 10.4.1.3 test - - junit - junit - test - + + org.eclipse.jetty.toolchain + jetty-test-helper + test + diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index db108a97ea6..44c3ed9793c 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -109,11 +109,11 @@ ${project.version} true - - junit - junit - test - + + org.eclipse.jetty.toolchain + jetty-test-helper + test +