diff --git a/org.springframework.aop/.classpath b/org.springframework.aop/.classpath index ec24fbadafe..512a59cf5f1 100644 --- a/org.springframework.aop/.classpath +++ b/org.springframework.aop/.classpath @@ -11,7 +11,7 @@ - + diff --git a/org.springframework.aop/aop.iml b/org.springframework.aop/aop.iml index f6efca15e91..18ccbe26885 100644 --- a/org.springframework.aop/aop.iml +++ b/org.springframework.aop/aop.iml @@ -93,11 +93,11 @@ - + - + diff --git a/org.springframework.aop/ivy.xml b/org.springframework.aop/ivy.xml index 3ba3cd4d442..ad3a779f6ac 100644 --- a/org.springframework.aop/ivy.xml +++ b/org.springframework.aop/ivy.xml @@ -34,7 +34,7 @@ - + diff --git a/org.springframework.beans/.classpath b/org.springframework.beans/.classpath index 29117f917c7..d76169022ab 100644 --- a/org.springframework.beans/.classpath +++ b/org.springframework.beans/.classpath @@ -10,7 +10,7 @@ - + diff --git a/org.springframework.beans/beans.iml b/org.springframework.beans/beans.iml index f390a208c92..362fbff8ed2 100644 --- a/org.springframework.beans/beans.iml +++ b/org.springframework.beans/beans.iml @@ -59,11 +59,11 @@ - + - + diff --git a/org.springframework.beans/ivy.xml b/org.springframework.beans/ivy.xml index 57077c1febb..35e406b6e78 100644 --- a/org.springframework.beans/ivy.xml +++ b/org.springframework.beans/ivy.xml @@ -26,7 +26,7 @@ - + diff --git a/org.springframework.context.support/.classpath b/org.springframework.context.support/.classpath index b320cf3f508..203c72781b2 100644 --- a/org.springframework.context.support/.classpath +++ b/org.springframework.context.support/.classpath @@ -16,7 +16,7 @@ - + diff --git a/org.springframework.context.support/context-support.iml b/org.springframework.context.support/context-support.iml index c5a4106c4de..89581ee4b1c 100644 --- a/org.springframework.context.support/context-support.iml +++ b/org.springframework.context.support/context-support.iml @@ -96,11 +96,11 @@ - + - + diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml index 8a6ba7b858b..5edcf568906 100644 --- a/org.springframework.context.support/ivy.xml +++ b/org.springframework.context.support/ivy.xml @@ -45,7 +45,7 @@ - + diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath index ac16aa8a4e6..2db63a760a9 100644 --- a/org.springframework.context/.classpath +++ b/org.springframework.context/.classpath @@ -23,7 +23,7 @@ - + diff --git a/org.springframework.context/context.iml b/org.springframework.context/context.iml index cadb45572f0..2ee940df9a3 100644 --- a/org.springframework.context/context.iml +++ b/org.springframework.context/context.iml @@ -123,11 +123,11 @@ - + - + diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml index d8b6a5afce0..793f9938e78 100644 --- a/org.springframework.context/ivy.xml +++ b/org.springframework.context/ivy.xml @@ -57,7 +57,7 @@ - + diff --git a/org.springframework.core/.classpath b/org.springframework.core/.classpath index 7bb18c0b19f..fbc9daafaba 100644 --- a/org.springframework.core/.classpath +++ b/org.springframework.core/.classpath @@ -7,7 +7,7 @@ - + diff --git a/org.springframework.core/core.iml b/org.springframework.core/core.iml index d1b95d4d68c..83229123d02 100644 --- a/org.springframework.core/core.iml +++ b/org.springframework.core/core.iml @@ -69,11 +69,11 @@ - + - + diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml index bf667eb605f..3465fd8d15c 100644 --- a/org.springframework.core/ivy.xml +++ b/org.springframework.core/ivy.xml @@ -32,7 +32,7 @@ conf="optional->compile"/> - + diff --git a/org.springframework.expression/.classpath b/org.springframework.expression/.classpath index 334a45cf1f4..176e4ebd76f 100644 --- a/org.springframework.expression/.classpath +++ b/org.springframework.expression/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.springframework.expression/expression.iml b/org.springframework.expression/expression.iml index 00ece775615..39c21fa7747 100644 --- a/org.springframework.expression/expression.iml +++ b/org.springframework.expression/expression.iml @@ -25,7 +25,7 @@ - + diff --git a/org.springframework.expression/ivy.xml b/org.springframework.expression/ivy.xml index 684467adadc..ed2fc4a88d8 100644 --- a/org.springframework.expression/ivy.xml +++ b/org.springframework.expression/ivy.xml @@ -24,7 +24,7 @@ - + diff --git a/org.springframework.integration-tests/.classpath b/org.springframework.integration-tests/.classpath index 2d1a2687034..67233bbe81b 100644 --- a/org.springframework.integration-tests/.classpath +++ b/org.springframework.integration-tests/.classpath @@ -19,7 +19,7 @@ - + diff --git a/org.springframework.integration-tests/integration-tests.iml b/org.springframework.integration-tests/integration-tests.iml index 477e454b22d..1f06973719b 100644 --- a/org.springframework.integration-tests/integration-tests.iml +++ b/org.springframework.integration-tests/integration-tests.iml @@ -522,11 +522,11 @@ - + - + diff --git a/org.springframework.integration-tests/ivy.xml b/org.springframework.integration-tests/ivy.xml index 4ee45bc6dc7..2fdf9e5e7bd 100644 --- a/org.springframework.integration-tests/ivy.xml +++ b/org.springframework.integration-tests/ivy.xml @@ -94,7 +94,7 @@ - + diff --git a/org.springframework.jdbc/.classpath b/org.springframework.jdbc/.classpath index b9a398df391..0f2cdefa67f 100644 --- a/org.springframework.jdbc/.classpath +++ b/org.springframework.jdbc/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.springframework.jdbc/ivy.xml b/org.springframework.jdbc/ivy.xml index dd3aa0053f4..0b388d0c1b6 100644 --- a/org.springframework.jdbc/ivy.xml +++ b/org.springframework.jdbc/ivy.xml @@ -34,7 +34,7 @@ - + diff --git a/org.springframework.jdbc/jdbc.iml b/org.springframework.jdbc/jdbc.iml index f046db22111..38e90218bc1 100644 --- a/org.springframework.jdbc/jdbc.iml +++ b/org.springframework.jdbc/jdbc.iml @@ -74,11 +74,11 @@ - + - + diff --git a/org.springframework.jms/.classpath b/org.springframework.jms/.classpath index 62b7eb61ed1..c2e5e13575a 100644 --- a/org.springframework.jms/.classpath +++ b/org.springframework.jms/.classpath @@ -10,7 +10,7 @@ - + diff --git a/org.springframework.jms/ivy.xml b/org.springframework.jms/ivy.xml index 76118ad2db3..f0c6ce14f8d 100644 --- a/org.springframework.jms/ivy.xml +++ b/org.springframework.jms/ivy.xml @@ -31,7 +31,7 @@ - + - + - + diff --git a/org.springframework.orm/.classpath b/org.springframework.orm/.classpath index c8cdb8b6926..f74ef944b78 100644 --- a/org.springframework.orm/.classpath +++ b/org.springframework.orm/.classpath @@ -18,7 +18,7 @@ - + diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml index fe68bda63f8..93e0a9673e8 100644 --- a/org.springframework.orm/ivy.xml +++ b/org.springframework.orm/ivy.xml @@ -57,7 +57,7 @@ - + diff --git a/org.springframework.orm/orm.iml b/org.springframework.orm/orm.iml index 53348c522b9..5d1a290e8bc 100644 --- a/org.springframework.orm/orm.iml +++ b/org.springframework.orm/orm.iml @@ -96,11 +96,11 @@ - + - + diff --git a/org.springframework.oxm/.classpath b/org.springframework.oxm/.classpath index 91bf769d807..6fe1af5a166 100644 --- a/org.springframework.oxm/.classpath +++ b/org.springframework.oxm/.classpath @@ -16,7 +16,7 @@ - + diff --git a/org.springframework.oxm/ivy.xml b/org.springframework.oxm/ivy.xml index b4b0ffc2758..2ea678b4690 100644 --- a/org.springframework.oxm/ivy.xml +++ b/org.springframework.oxm/ivy.xml @@ -47,7 +47,7 @@ - + diff --git a/org.springframework.oxm/oxm.iml b/org.springframework.oxm/oxm.iml index 8d5027285bb..a6409fe4677 100644 --- a/org.springframework.oxm/oxm.iml +++ b/org.springframework.oxm/oxm.iml @@ -152,11 +152,11 @@ - + - + diff --git a/org.springframework.samples.petclinic/.classpath b/org.springframework.samples.petclinic/.classpath index d5686ab9912..f8c1dc59fad 100644 --- a/org.springframework.samples.petclinic/.classpath +++ b/org.springframework.samples.petclinic/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.springframework.samples.petclinic/ivy.xml b/org.springframework.samples.petclinic/ivy.xml index 47955c4918a..eaccd00ebbd 100644 --- a/org.springframework.samples.petclinic/ivy.xml +++ b/org.springframework.samples.petclinic/ivy.xml @@ -42,7 +42,7 @@ - + @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/org.springframework.samples.petclinic/petclinic.iml b/org.springframework.samples.petclinic/petclinic.iml index 140a697a603..34c67d11392 100644 --- a/org.springframework.samples.petclinic/petclinic.iml +++ b/org.springframework.samples.petclinic/petclinic.iml @@ -173,11 +173,11 @@ - + - + diff --git a/org.springframework.test/.classpath b/org.springframework.test/.classpath index f0a84ccde2d..247b29a9f8b 100644 --- a/org.springframework.test/.classpath +++ b/org.springframework.test/.classpath @@ -20,7 +20,7 @@ - + diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml index 06194d35200..9e4dfd64eda 100644 --- a/org.springframework.test/ivy.xml +++ b/org.springframework.test/ivy.xml @@ -26,7 +26,7 @@ - + diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java index cab324b59e7..0bad691e396 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java @@ -220,11 +220,6 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner { } } - private EachTestNotifier makeNotifier(FrameworkMethod frameworkMethod, RunNotifier notifier) { - Description description = describeChild(frameworkMethod); - return new EachTestNotifier(notifier, description); - } - /** * Augments the default JUnit behavior * {@link #withPotentialRepeat(FrameworkMethod, Object, Statement) with diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf index a8e0b51969c..1fb6786b5c0 100644 --- a/org.springframework.test/template.mf +++ b/org.springframework.test/template.mf @@ -17,7 +17,7 @@ Import-Template: org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, - org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional, + org.junit.*;version="[4.6.0, 5.0.0)";resolution:=optional, org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional, org.testng.*;version="[5.9.0, 6.0.0)";resolution:=optional, org.w3c.dom.*;version="0";resolution:=optional diff --git a/org.springframework.test/test.iml b/org.springframework.test/test.iml index f09c7f935ea..9a86872008b 100644 --- a/org.springframework.test/test.iml +++ b/org.springframework.test/test.iml @@ -78,11 +78,11 @@ - + - + diff --git a/org.springframework.transaction/.classpath b/org.springframework.transaction/.classpath index 3cdfbe604d0..8e28caf3de7 100644 --- a/org.springframework.transaction/.classpath +++ b/org.springframework.transaction/.classpath @@ -15,7 +15,7 @@ - + diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml index 46353beaf33..5cd249a66e4 100644 --- a/org.springframework.transaction/ivy.xml +++ b/org.springframework.transaction/ivy.xml @@ -33,7 +33,7 @@ - + diff --git a/org.springframework.transaction/transaction.iml b/org.springframework.transaction/transaction.iml index c497ed60654..4ebec68b6a3 100644 --- a/org.springframework.transaction/transaction.iml +++ b/org.springframework.transaction/transaction.iml @@ -115,11 +115,11 @@ - + - + diff --git a/org.springframework.web.portlet/.classpath b/org.springframework.web.portlet/.classpath index 763cf00925b..ab7d3f72609 100644 --- a/org.springframework.web.portlet/.classpath +++ b/org.springframework.web.portlet/.classpath @@ -14,7 +14,7 @@ - + diff --git a/org.springframework.web.portlet/ivy.xml b/org.springframework.web.portlet/ivy.xml index 0480526658c..c50c2653ca0 100644 --- a/org.springframework.web.portlet/ivy.xml +++ b/org.springframework.web.portlet/ivy.xml @@ -34,7 +34,7 @@ - + diff --git a/org.springframework.web.portlet/web-portlet.iml b/org.springframework.web.portlet/web-portlet.iml index 7ca2a7764f0..c32a583e48b 100644 --- a/org.springframework.web.portlet/web-portlet.iml +++ b/org.springframework.web.portlet/web-portlet.iml @@ -63,11 +63,11 @@ - + - + diff --git a/org.springframework.web.servlet/.classpath b/org.springframework.web.servlet/.classpath index 2c8e6c9fde0..b5b922f4503 100644 --- a/org.springframework.web.servlet/.classpath +++ b/org.springframework.web.servlet/.classpath @@ -41,7 +41,7 @@ - + diff --git a/org.springframework.web.servlet/ivy.xml b/org.springframework.web.servlet/ivy.xml index 880dc5128ac..8fba6e90ab8 100644 --- a/org.springframework.web.servlet/ivy.xml +++ b/org.springframework.web.servlet/ivy.xml @@ -77,7 +77,7 @@ - + diff --git a/org.springframework.web.servlet/web-servlet.iml b/org.springframework.web.servlet/web-servlet.iml index 7ede5838d9c..d0b815af32d 100644 --- a/org.springframework.web.servlet/web-servlet.iml +++ b/org.springframework.web.servlet/web-servlet.iml @@ -120,11 +120,11 @@ - + - + diff --git a/org.springframework.web/.classpath b/org.springframework.web/.classpath index 95d2285803a..073a9a14ea1 100644 --- a/org.springframework.web/.classpath +++ b/org.springframework.web/.classpath @@ -28,7 +28,7 @@ - + diff --git a/org.springframework.web/ivy.xml b/org.springframework.web/ivy.xml index 095e7654945..5815f38280a 100644 --- a/org.springframework.web/ivy.xml +++ b/org.springframework.web/ivy.xml @@ -68,7 +68,7 @@ - + - + - +