Back from JSON::MaybeXS to JSON (#877)

debian/control

@@ -20,7 +20,7 @@ Build-Depends-Indep: libapache-session-perl,
                      libglib-perl,
                      libhtml-template-perl,
                      libio-string-perl,
-                     libjson-maybexs-perl,
+                     libjson,
                      liblasso-perl (>= 2.3.0),
                      libmime-lite-perl,
                      libmouse-perl,
@@ -157,14 +157,15 @@ Depends: ${misc:Depends},
          libcrypt-openssl-x509-perl,
          libcrypt-rijndael-perl,
          libdbi-perl,
-         libjson-maybexs-perl,
+         libjson,
          libmouse-perl,
          libnet-cidr-lite-perl,
          libsoap-lite-perl
 Recommends: libapache-session-browseable-perl,
             libhtml-template-perl,
-            libnet-ldap-perl,
             libhttp-message-perl | libwww-perl (<< 6),
+            libjson-xs-perl,
+            libnet-ldap-perl,
             liblwp-protocol-https-perl | libwww-perl (<< 6),
             libxml-libxml-perl,
             libxml-simple-perl
@@ -189,7 +190,7 @@ Depends: ${misc:Depends},
          libconvert-pem-perl,
          libcrypt-openssl-rsa-perl,
          libhtml-template-perl,
-         libjson-maybexs-perl,
+         libjson,
          liblemonldap-ng-common-perl (= ${binary:Version}),
          liblemonldap-ng-handler-perl (= ${binary:Version}),
          libmouse-perl,
@@ -198,6 +199,7 @@ Depends: ${misc:Depends},
 Recommends: lemonldap-ng-doc (= ${binary:Version}),
             libapache-session-browseable-perl,
             libapache2-mod-fcgid | libapache2-mod-fastcgi | nginx,
+            libjson-xs-perl,
             liblwp-protocol-https-perl | libwww-perl (<< 6),
             libxml-libxml-perl,
             libxml-libxslt-perl,

lemonldap-ng-common/Makefile.PL

@@ -34,7 +34,7 @@ WriteMakefile(
             'Apache::Session::Browseable' => 0,
             'HTML::Template'              => 0,
             'HTTP::Message'               => 0,
-            'JSON::MaybeXS'               => 0,
+            'JSON'                        => 0,
             'Net::LDAP'                   => 0,
             'XML::Simple'                 => 0,
             'XML::LibXML'                 => 0,

lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session/Serialize/JSON.pm

@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::Apache::Session::Serialize::JSON;
 
 use strict;
 use vars qw($VERSION);
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 
 our $VERSION = '1.9.0';
 

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/CDBI.pm

@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::Conf::CDBI;
 
 use strict;
 use utf8;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use Lemonldap::NG::Common::Conf::_DBI;
 
 our $VERSION = '1.4.0';

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/File.pm

@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::Conf::File;
 
 use strict;
 use Lemonldap::NG::Common::Conf::Constants;    #inherits
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use Encode;
 
 our $VERSION = '1.4.0';

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm

@@ -3,7 +3,7 @@ package Lemonldap::NG::Common::Conf::Serializer;
 use strict;
 use utf8;
 use Encode;
-use JSON::MaybeXS qw(JSON to_json from_json);
+use JSON;
 use Lemonldap::NG::Common::Conf::Constants;
 
 our $VERSION = '1.9.0';

lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm

@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::PSGI;
 
 use 5.10.0;
 use Mouse;
-use JSON::MaybeXS qw(JSON to_json from_json);
+use JSON;
 use Lemonldap::NG::Common::PSGI::Constants;
 use Lemonldap::NG::Common::PSGI::Request;
 

lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm

@@ -2,7 +2,7 @@ package Lemonldap::NG::Common::PSGI::Request;
 
 use strict;
 use Mouse;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use URI::Escape;
 
 our $VERSION = '1.9.0';

lemonldap-ng-manager/Makefile.PL

@@ -17,7 +17,7 @@ WriteMakefile(
         'Convert::PEM'           => 0,
         'Crypt::OpenSSL::RSA'    => 0,
         'HTML::Template'         => 0,
-        'JSON::MaybeXS'          => 0,
+        'JSON'                   => 0,
         'Lemonldap::NG::Common'  => '1.9.0',
         'Lemonldap::NG::Handler' => '1.9.0',
         'LWP'                    => 0,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm

@@ -9,7 +9,7 @@ use Lemonldap::NG::Manager::Build::CTrees;
 use Lemonldap::NG::Manager::Conf::Zero;
 use Data::Dumper;
 use Regexp::Assemble;
-use JSON::MaybeXS;
+use JSON;
 use Getopt::Std;
 use IO::String;
 

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli/Lib.pm

@@ -1,6 +1,6 @@
 package Lemonldap::NG::Manager::Cli::Lib;
 
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use Mouse;
 use utf8;
 use Lemonldap::NG::Manager;

lemonldap-ng-manager/t/05-rest-api.t

@@ -4,7 +4,7 @@
 # Check also metadatas request (root of a conf)
 
 use Test::More;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use strict;
 
 require 't/test-lib.pm';

lemonldap-ng-manager/t/06-rest-api.t

@@ -4,7 +4,7 @@
 
 use Test::More;
 use strict;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use IO::String;
 require 't/test-lib.pm';
 

lemonldap-ng-manager/t/10-save-unchanged-conf.t

@@ -4,7 +4,7 @@
 
 use Test::More;
 use strict;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use Data::Dumper;
 require 't/test-lib.pm';
 

lemonldap-ng-manager/t/12-save-changed-conf.t

@@ -5,7 +5,7 @@
 
 use Test::More;
 use strict;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use Data::Dumper;
 require 't/test-lib.pm';
 

lemonldap-ng-manager/t/40-sessions.t

@@ -3,7 +3,7 @@
 # Test sessions explorer API
 
 use Test::More;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use strict;
 use Lemonldap::NG::Common::Session;
 

lemonldap-ng-manager/t/90-translations.t

@@ -3,7 +3,7 @@
 # Verify that languages translation cover all `trspan`
 
 use Test::More;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use strict;
 
 my $langDir = 'site/static/languages';

lemonldap-ng-portal/Makefile.PL

@@ -13,7 +13,7 @@ WriteMakefile(
             'DBI'                    => 0,
             'Glib'                   => 0,
             'HTTP::Message'          => 0,
-            'JSON::MaybeXS'          => 0,
+            'JSON'                   => 0,
             'Lasso'                  => '2.3.0',
             'Lemonldap::NG::Handler' => '1.9.0',
             'LWP'                    => 0,

lemonldap-ng-portal/example/oauth2.pl

@@ -3,7 +3,7 @@
 # Simple OpenID Connect client
 
 use strict;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use LWP::UserAgent;
 use MIME::Base64
   qw/encode_base64url encode_base64 decode_base64url decode_base64/;

lemonldap-ng-portal/example/openid-configuration.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 use Lemonldap::NG::Portal::SharedConf;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use strict;
 
 my $portal = Lemonldap::NG::Portal::SharedConf->new();

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthBrowserID.pm

@@ -9,7 +9,7 @@ use strict;
 use Lemonldap::NG::Portal::Simple;
 use Lemonldap::NG::Portal::_Browser;
 use HTTP::Request;
-use JSON::MaybeXS qw(JSON to_json from_json);
+use JSON;
 
 our @ISA     = (qw(Lemonldap::NG::Portal::_Browser));
 our $VERSION = '1.3.0';

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm

@@ -6,7 +6,7 @@
 package Lemonldap::NG::Portal::_OpenIDConnect;
 
 use strict;
-use JSON::MaybeXS qw(to_json from_json);
+use JSON;
 use MIME::Base64
   qw/encode_base64url encode_base64 decode_base64url decode_base64/;
 use URI::Escape;