diff --git a/org.springframework.aop/.classpath b/org.springframework.aop/.classpath index ec24fbadafe98571ef9025be90cc77b222398031..512a59cf5f174a3e71c4f32df39f3ad85e6ead1f 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 f6efca15e9194e5c04389bce3fc788b82cd1db4b..18ccbe26885e2a53db1cd1b32e80cb96464b028c 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 3ba3cd4d4423b6540e78cbe65a00d91ade145b81..ad3a779f6acadb6c2bd48bce9cd4a9a990f476b6 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 29117f917c77fccec9c86398543a958da533d7b8..d76169022abc719d78b2e26be6e8bf4109c2dd8d 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 f390a208c9295f1c28b79707cfe08923c38169c9..362fbff8ed2a06a5743d21cc8d36a98d990d4c8b 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 57077c1febb18def28004ed5c8e1cf1fc3a1be33..35e406b6e784bf7345e2f88f7c89dd5709ad9b93 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 b320cf3f5087da4a17c3d8767b1c73c266e1a8ef..203c72781b20faab900b92aeea4f22451821a575 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 c5a4106c4de4fe487d89f126891d30a52147fdf5..89581ee4b1c9473c46daba61c9c8d4c6119a3639 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 8a6ba7b858ba2ca20623139aaa18907f4fc4984a..5edcf56890661fe2df9b6e32bdb34508d90d4852 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 ac16aa8a4e63dfef26b44eb1ad2235d1e90b4aeb..2db63a760a9370957aa9e05ae210f3abdc722d9d 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 cadb45572f0ff2b90260ab0f577e1ac1913c994d..2ee940df9a37b37d47015c0af7ed9ff89444dc36 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 d8b6a5afce0334db97c72da15bb91f9432f7a207..793f9938e785705c672019d86c9fdba64d00c82b 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 7bb18c0b19fb4188fb1cfdd1570dc14931ecf443..fbc9daafaba37293f3051ff0e585d1aab9d3f29f 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 d1b95d4d68caf260d77d8846ab56fe0cfbfe6ee4..83229123d027b7ad69eca06b61f67bae7c032f9e 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 bf667eb605fac421e12aa14b25202f9b98677c32..3465fd8d15c2d612e8aeca05339a0c343248dada 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 334a45cf1f484ebeb7f841f6bf823c17db4efe4a..176e4ebd76fc10beecaf8c020b925b0a2e82ba9d 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 00ece7756156a66ad0d53ea90bc613fde47f1454..39c21fa77478e690c977e562ce0014959a5a91c7 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 684467adadca376e8c30758ee36ffff3e3fe2a50..ed2fc4a88d8d480439061387572c142f87eb0412 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 2d1a2687034159dd4eb5e6aea19a5dea974e6025..67233bbe81bf023882f6eda3b987f80b3242b6ec 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 477e454b22d9df6123a2860b23546a5fc33290f8..1f06973719b0baf31d458a59f442cdb32f56f937 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 4ee45bc6dc772248cf01e6be9b96d91d8b635c8d..2fdf9e5e7bdf0b55efae7bd9cd6459e7c325b7e7 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 b9a398df39141a528567e888332cf1ec6c38afae..0f2cdefa67f31886b62cbabf438ea15a15b62e23 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 dd3aa0053f4b630704cf7c7a426448e8b8a25792..0b388d0c1b66246b4f6ffeb0d446618f6fca8f10 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 f046db221117ffd7591741c89733608a8d9ee919..38e90218bc1b2e8db908253342f9034c36f4a426 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 62b7eb61ed1a55d047e1f4bd407e9c9a97681290..c2e5e13575a200ee6e7bb8856f3bea4d56726d4d 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 76118ad2db36013c3e3c9dae6c31d170a479e904..f0c6ce14f8d931c5265db4689a4cea31691b2f27 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 c8cdb8b69264e98dde5d75e58adfe2ddf1758826..f74ef944b78289562393007d345ac8a52fd81ccb 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 fe68bda63f89fac20541bfd0a7531c06b70de492..93e0a9673e823136881be88ad1bec1119afed45f 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 53348c522b9e15d93665b462c238a7e27e22827e..5d1a290e8bc40233576aa7a3befd4ee47cfda55a 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 91bf769d80729a1ca903683e469008a9cbb2d758..6fe1af5a1666edbf67fb98ce2b6b8fee181053d6 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 b4b0ffc275880b669e0c8586a7667b44a1d72ff8..2ea678b4690a6166816af3051a2ea60ce1054bb8 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 8d5027285bbe5c490ecd76804700c06100804c9b..a6409fe46776bcb6317258053ba8465180ee6e96 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 d5686ab991213a169775b1e5a477b0aefc2ba7ed..f8c1dc59fadbabff0c1110c824bd6e07510f808f 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 47955c4918abd8fd4015f23d75b77d9b49a38889..eaccd00ebbdee30dd1a9f3e0136fdaf86fb3bdf1 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 140a697a603d797ea418de5abcb6efb3bc0cb70b..34c67d113929c866f80d0f46134d72d9a0875bc1 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 f0a84ccde2d1f7772aa0be5609fa91425af62d8f..247b29a9f8b3a8d8d31c30757007679f6d0ab17c 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 06194d35200eac1180b827ce0eabade6bbd11fb5..9e4dfd64eda97e3cef7fe0ec561d3c257952ed44 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 cab324b59e76a35430b7cb8797f694cdd9f65f6f..0bad691e3961df7ee08b73843b9ddacdab323174 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 a8e0b51969cd7383f5f68ab90eb1a5cb3058cb86..1fb6786b5c0e23eae82cd1b07bb22e2acfc1a561 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 f09c7f935ea0302fdac7d1bf576e6b7f3a7f2daa..9a86872008bddee65bb846e8415540c225f94a9c 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 3cdfbe604d0267216b17c66f753805111e7ac30f..8e28caf3de77f3e5becd0ceb3e4cd710a00ef8a0 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 46353beaf33274c6d4c6b88012f6a347ee959bb2..5cd249a66e4cfaa0c47f709f9fb9651556b04fb3 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 c497ed606543b9ea465bfac052f5fb405ee32fb4..4ebec68b6a3b9229df7567bd0928c23b817cc118 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 763cf00925b2f7d0d555a93527db87d29e972540..ab7d3f72609dcea555b0e7dd6d6ee3f46bc3294a 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 0480526658c123d026d9d8eaef062a2761a78d4e..c50c2653ca07adc508b857f1deded1808cb52439 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 7ca2a7764f0077f46be3f7d7e5cf7e16ea0715b4..c32a583e48b5923e243836249d35ff351590e37f 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 2c8e6c9fde02cef3c0b47cc75f80ccc59b9b9327..b5b922f4503bbe8741be70f871aa1b42abf1dfd8 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 880dc5128acf9b092b244f8a012dc1559bddd65c..8fba6e90ab83761d5952c64069523f8cd15d58af 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 7ede5838d9ce53e8b4e9613cf37a8623e1c0d672..d0b815af32d66627ceb45e8b373fa940a48dbd60 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 95d2285803a740be99c2fb1682e2f1311504b67f..073a9a14ea19243729f559a4b2e87d72236b950e 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 095e765494513e71586957681e8a359775469573..5815f38280ac59254771dfa6b5bfbc93bcc529c3 100644 --- a/org.springframework.web/ivy.xml +++ b/org.springframework.web/ivy.xml @@ -68,7 +68,7 @@ - + - + - +