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

diff --git a/Makefile.PL b/Makefile.PL
index 29eb95a..af34df9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -41,6 +41,7 @@ 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 +109,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',