X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=15b0374ce98f69cdf4f4dda8b0a9b2d8fe708839;hb=647a251fa90fc925b194a8e1223a9d6706262ee5;hp=de27fe1cbc4788e03607a301aa308d39115df8c3;hpb=6b2a933b5b3820e494f9b5804c7c2eb6083bcf09;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index de27fe1..15b0374 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,6 +35,7 @@ requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
 
 test_requires 'Class::Data::Inheritable';
+test_requires 'Test::MockObject';
 
 if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})
     || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) {
@@ -126,6 +127,8 @@ check_conflicts();
 sub check_conflicts {
     my %conflicts = (
         'Catalyst::Plugin::Authentication' => '0.100092',
+        'CatalystX::Imports'               => '0.03',
+        'Catalyst-Plugin-HashedCookies'    => '1.03',
     );
 
     my $found = 0;