X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=71898e11546a2ebeab8452a3525b7b427ae2dc30;hp=cd3dd33a420e43712e1cc4c7470bdb9fff58379f;hb=a80247cf50dc5e43fbdf5fb56df62db461c1d3ce;hpb=17b3d80076b6acb25d56ed83b0ed7134ed4fb343

diff --git a/Makefile.PL b/Makefile.PL
index cd3dd33..71898e1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -39,9 +39,6 @@ requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespac
 recommends 'B::Hooks::OP::Check::StashChange';
 
 test_requires 'Class::Data::Inheritable';
-test_requires 'Test::MockObject' => '1.07'; # Newish (hah, 2006!) version to
-                                            # hopefully avoid broken distro
-                                            # packages (RT#46104)
 test_requires 'Test::Exception';
 
 # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate is available
@@ -110,6 +107,7 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Component::ACCEPT_CONTEXT' => '0.06',
     'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
                                        # should have been a core fix.
     'Catalyst::Plugin::Unicode::Encoding' => '0.2',