X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=71898e11546a2ebeab8452a3525b7b427ae2dc30;hb=62ef37bfeea1b4e5ec03ad4053d3ed7816758844;hp=29eb95a8d059be576de67de8db4f0e9e34112e08;hpb=d75b106eaf44f1f9a42c0a9375f75579349090a9;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index 29eb95a..71898e1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,13 +34,12 @@ requires 'Tree::Simple::Visitor::FindByPath';
 requires 'URI' => '1.35';
 requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
+requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace
 
 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
 if ($ENV{AGGREGATE_TESTS} && can_use('Test::Aggregate', '0.34_01')) {
@@ -108,9 +107,10 @@ 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.1',
+    'Catalyst::Plugin::Unicode::Encoding' => '0.2',
     'Catalyst::Authentication::Credential::HTTP' => '1.009',
     'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',