From 2f3b867fdb5187f88b4f91b5cd1cdcdd46866ec2 Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@mozilla.org>
Date: Thu, 28 Jul 2016 14:21:14 -0400
Subject: Bug 1183647 - Optional Perl modules related to REST should now be
 mandatory r=dylan,a=dylan

---
 META.json   | 25 +++++++------------------
 META.yml    | 17 ++++++-----------
 Makefile.PL | 20 +++++---------------
 rest.cgi    |  7 +------
 4 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/META.json b/META.json
index fc6ff8062..26053a8e2 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Bugzilla Developers <developers@bugzilla.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150005",
+   "generated_by" : "ExtUtils::MakeMaker version 7.18, CPAN::Meta::Converter version 2.143240",
    "license" : [
       "unknown"
    ],
@@ -55,7 +55,6 @@
          "prereqs" : {
             "runtime" : {
                "requires" : {
-                  "Moo" : "2",
                   "MooX::StrictConstructor" : "0.008",
                   "Type::Tiny" : "1"
                }
@@ -270,20 +269,6 @@
             }
          }
       },
-      "rest" : {
-         "description" : "REST Interface",
-         "prereqs" : {
-            "runtime" : {
-               "requires" : {
-                  "HTTP::Request" : "0",
-                  "HTTP::Response" : "0",
-                  "Module::Runtime" : "0",
-                  "Moo" : "2",
-                  "Test::Taint" : "1.06"
-               }
-            }
-         }
-      },
       "smtp_auth" : {
          "description" : "SMTP Authentication",
          "prereqs" : {
@@ -378,10 +363,15 @@
             "Email::MIME" : "1.904",
             "Email::Sender" : "1.300011",
             "File::Slurp" : "9999.13",
+            "HTTP::Request" : "0",
+            "HTTP::Response" : "0",
             "JSON::XS" : "2.01",
             "List::MoreUtils" : "0.32",
             "Math::Random::ISAAC" : "v1.0.1",
+            "Module::Runtime" : "0",
+            "Moo" : "2",
             "Template" : "2.24",
+            "Test::Taint" : "1.06",
             "URI" : "1.55",
             "perl" : "5.014000"
          }
@@ -397,6 +387,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "v5.1.1+",
-   "x_serialization_backend" : "JSON::PP version 2.27203"
+   "version" : "v5.1.1+"
 }
diff --git a/META.yml b/META.yml
index 5ed4ee620..c606232de 100644
--- a/META.yml
+++ b/META.yml
@@ -12,7 +12,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '6.55'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150005'
+generated_by: 'ExtUtils::MakeMaker version 7.18, CPAN::Meta::Converter version 2.143240'
 license: unknown
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -38,7 +38,6 @@ optional_features:
   csp:
     description: 'Content-Security-Policy support'
     requires:
-      Moo: '2'
       MooX::StrictConstructor: '0.008'
       Type::Tiny: '1'
   detect_charset:
@@ -135,14 +134,6 @@ optional_features:
       CGI::Compile: '0'
       CGI::Emulate::PSGI: '0'
       Plack: '1.0031'
-  rest:
-    description: 'REST Interface'
-    requires:
-      HTTP::Request: '0'
-      HTTP::Response: '0'
-      Module::Runtime: '0'
-      Moo: '2'
-      Test::Taint: '1.06'
   smtp_auth:
     description: 'SMTP Authentication'
     requires:
@@ -187,11 +178,15 @@ requires:
   Email::MIME: '1.904'
   Email::Sender: '1.300011'
   File::Slurp: '9999.13'
+  HTTP::Request: '0'
+  HTTP::Response: '0'
   JSON::XS: '2.01'
   List::MoreUtils: '0.32'
   Math::Random::ISAAC: v1.0.1
+  Module::Runtime: '0'
+  Moo: '2'
   Template: '2.24'
+  Test::Taint: '1.06'
   URI: '1.55'
   perl: '5.014000'
 version: v5.1.1+
-x_serialization_backend: 'CPAN::Meta::YAML version 0.016'
diff --git a/Makefile.PL b/Makefile.PL
index 101bdf32b..36559b63c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -56,10 +56,15 @@ my %requires = (
     'Email::MIME'         => '1.904',
     'Email::Sender'       => '1.300011',
     'File::Slurp'         => '9999.13',
+    'HTTP::Request'       => 0,
+    'HTTP::Response'      => 0,
     'JSON::XS'            => '2.01',
     'List::MoreUtils'     => '0.32',
     'Math::Random::ISAAC' => '1.0.1',
+    'Moo'                 => 2,
+    'Module::Runtime'     => 0,
     'Template'            => '2.24',
+    'Test::Taint'         => '1.06',
     'URI'                 => '1.55',
 );
 my %build_requires = (
@@ -262,20 +267,6 @@ my %optional_features = (
         description => 'Patch Viewer',
         prereqs => { runtime => { requires => { PatchReader => '0.9.6' } } }
     },
-    rest => {
-        description => 'REST Interface',
-        prereqs     => {
-            runtime => {
-                requires => {
-                    'Test::Taint'     => '1.06',
-                    'HTTP::Request'   => 0,
-                    'HTTP::Response'  => 0,
-                    Moo               => 2,
-                    'Module::Runtime' => 0
-                }
-            }
-        }
-    },
     jobqueue => {
         description => 'Mail Queueing',
         prereqs     => {
@@ -301,7 +292,6 @@ my %optional_features = (
         prereqs     => {
             runtime => {
                 requires => {
-                    Moo          => 2,
                     'Type::Tiny' => 1,
                     'MooX::StrictConstructor' => 0.008,
                 }
diff --git a/rest.cgi b/rest.cgi
index 185b60ddc..9681849b2 100755
--- a/rest.cgi
+++ b/rest.cgi
@@ -14,11 +14,6 @@ use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Error;
-BEGIN {
-    if (!Bugzilla->feature('rest')) {
-        ThrowUserError('feature_disabled', { feature => 'rest' });
-    }
-}
+
 Bugzilla->usage_mode(USAGE_MODE_REST);
 Bugzilla->api_server->handle();
-- 
cgit v1.2.3-24-g4f1b