X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=a1b635a682255419895a7d0dac62d682b4325c93;hb=c4586fd07d4c17c49b4da9c224c6dcf1a782a099;hp=a15ed5dd05e72dcbbf1c1750d7ddb81513ef5bac;hpb=cdc9666717c637b4b6ea6f52555b896a84c17ef0;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index a15ed5d..a1b635a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -38,9 +38,6 @@ requires 'MRO::Compat';
 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
@@ -109,6 +106,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',