update the cpanfile and dist.ini

6 files changed, 887 insertions, 164 deletions

diff --git a/Install b/Install
deleted file mode 100644
index 01501f6..0000000
--- a/Install
+++ /dev/null
@@ -1,43 +0,0 @@
-This is the Perl distribution URI.
-
-Installing URI is straightforward.
-
-## Installation with cpanm
-
-If you have cpanm, you only need one line:
-
-    % cpanm URI
-
-If you are installing into a system-wide directory, you may need to pass the
-"-S" flag to cpanm, which uses sudo to install the module:
-
-    % cpanm -S URI
-
-## Installing with the CPAN shell
-
-Alternatively, if your CPAN shell is set up, you should just be able to do:
-
-    % cpan URI
-
-## Manual installation
-
-As a last resort, you can manually install it. Download the tarball, untar it,
-then build it:
-
-    % perl Makefile.PL
-    % make && make test
-
-Then install it:
-
-    % make install
-
-If you are installing into a system-wide directory, you may need to run:
-
-    % sudo make install
-
-## Documentation
-
-URI documentation is available as POD.
-You can run perldoc from a shell to read the documentation:
-
-    % perldoc URI
diff --git a/META.json b/META.json
index fb441c6..0b8ec93 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Gisle Aas <gisle@activestate.com>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 6.007, CPAN::Meta::Converter version 2.150005",
+   "generated_by" : "Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150005",
    "license" : [
       "perl_5"
    ],
@@ -15,7 +15,6 @@
    "name" : "URI",
    "no_index" : {
       "directory" : [
-         "examples",
          "t",
          "xt"
       ]
@@ -31,12 +30,25 @@
       },
       "develop" : {
          "requires" : {
-            "Test::CPAN::Changes" : "0.19"
+            "File::Spec" : "0",
+            "IO::Handle" : "0",
+            "IPC::Open3" : "0",
+            "Pod::Coverage::TrustPod" : "0",
+            "Test::CPAN::Changes" : "0.19",
+            "Test::CPAN::Meta" : "0",
+            "Test::EOL" : "0",
+            "Test::MinimumVersion" : "0",
+            "Test::Mojibake" : "0",
+            "Test::More" : "0.94",
+            "Test::Pod" : "1.41",
+            "Test::Pod::Coverage" : "1.08",
+            "Test::Portability::Files" : "0",
+            "Test::Spelling" : "0.12",
+            "Test::Version" : "1"
          }
       },
       "runtime" : {
          "requires" : {
-            "Business::ISBN" : "0",
             "Carp" : "0",
             "Cwd" : "0",
             "Data::Dumper" : "0",
@@ -51,14 +63,17 @@
             "parent" : "0",
             "perl" : "5.008001",
             "strict" : "0",
+            "utf8" : "0",
             "warnings" : "0"
          }
       },
       "test" : {
          "recommends" : {
-            "Business::ISBN" : "0"
+            "CPAN::Meta" : "2.120900"
          },
          "requires" : {
+            "ExtUtils::MakeMaker" : "0",
+            "File::Spec" : "0",
             "File::Spec::Functions" : "0",
             "File::Temp" : "0",
             "Storable" : "0",
@@ -68,6 +83,180 @@
          }
       }
    },
+   "provides" : {
+      "URI" : {
+         "file" : "lib/URI.pm",
+         "version" : "6.06"
+      },
+      "URI::Escape" : {
+         "file" : "lib/URI/Escape.pm",
+         "version" : "6.06"
+      },
+      "URI::Heuristic" : {
+         "file" : "lib/URI/Heuristic.pm",
+         "version" : "6.06"
+      },
+      "URI::IRI" : {
+         "file" : "lib/URI/IRI.pm",
+         "version" : "6.06"
+      },
+      "URI::QueryParam" : {
+         "file" : "lib/URI/QueryParam.pm",
+         "version" : "6.06"
+      },
+      "URI::Split" : {
+         "file" : "lib/URI/Split.pm",
+         "version" : "6.06"
+      },
+      "URI::URL" : {
+         "file" : "lib/URI/URL.pm",
+         "version" : "6.06"
+      },
+      "URI::WithBase" : {
+         "file" : "lib/URI/WithBase.pm",
+         "version" : "6.06"
+      },
+      "URI::data" : {
+         "file" : "lib/URI/data.pm",
+         "version" : "6.06"
+      },
+      "URI::file" : {
+         "file" : "lib/URI/file.pm",
+         "version" : "6.06"
+      },
+      "URI::file::Base" : {
+         "file" : "lib/URI/file/Base.pm",
+         "version" : "6.06"
+      },
+      "URI::file::FAT" : {
+         "file" : "lib/URI/file/FAT.pm",
+         "version" : "6.06"
+      },
+      "URI::file::Mac" : {
+         "file" : "lib/URI/file/Mac.pm",
+         "version" : "6.06"
+      },
+      "URI::file::OS2" : {
+         "file" : "lib/URI/file/OS2.pm",
+         "version" : "6.06"
+      },
+      "URI::file::QNX" : {
+         "file" : "lib/URI/file/QNX.pm",
+         "version" : "6.06"
+      },
+      "URI::file::Unix" : {
+         "file" : "lib/URI/file/Unix.pm",
+         "version" : "6.06"
+      },
+      "URI::file::Win32" : {
+         "file" : "lib/URI/file/Win32.pm",
+         "version" : "6.06"
+      },
+      "URI::ftp" : {
+         "file" : "lib/URI/ftp.pm",
+         "version" : "6.06"
+      },
+      "URI::gopher" : {
+         "file" : "lib/URI/gopher.pm",
+         "version" : "6.06"
+      },
+      "URI::http" : {
+         "file" : "lib/URI/http.pm",
+         "version" : "6.06"
+      },
+      "URI::https" : {
+         "file" : "lib/URI/https.pm",
+         "version" : "6.06"
+      },
+      "URI::ldap" : {
+         "file" : "lib/URI/ldap.pm",
+         "version" : "6.06"
+      },
+      "URI::ldapi" : {
+         "file" : "lib/URI/ldapi.pm",
+         "version" : "6.06"
+      },
+      "URI::ldaps" : {
+         "file" : "lib/URI/ldaps.pm",
+         "version" : "6.06"
+      },
+      "URI::mailto" : {
+         "file" : "lib/URI/mailto.pm",
+         "version" : "6.06"
+      },
+      "URI::mms" : {
+         "file" : "lib/URI/mms.pm",
+         "version" : "6.06"
+      },
+      "URI::news" : {
+         "file" : "lib/URI/news.pm",
+         "version" : "6.06"
+      },
+      "URI::nntp" : {
+         "file" : "lib/URI/nntp.pm",
+         "version" : "6.06"
+      },
+      "URI::pop" : {
+         "file" : "lib/URI/pop.pm",
+         "version" : "6.06"
+      },
+      "URI::rlogin" : {
+         "file" : "lib/URI/rlogin.pm",
+         "version" : "6.06"
+      },
+      "URI::rsync" : {
+         "file" : "lib/URI/rsync.pm",
+         "version" : "6.06"
+      },
+      "URI::rtsp" : {
+         "file" : "lib/URI/rtsp.pm",
+         "version" : "6.06"
+      },
+      "URI::rtspu" : {
+         "file" : "lib/URI/rtspu.pm",
+         "version" : "6.06"
+      },
+      "URI::sftp" : {
+         "file" : "lib/URI/sftp.pm",
+         "version" : "6.06"
+      },
+      "URI::sip" : {
+         "file" : "lib/URI/sip.pm",
+         "version" : "6.06"
+      },
+      "URI::sips" : {
+         "file" : "lib/URI/sips.pm",
+         "version" : "6.06"
+      },
+      "URI::snews" : {
+         "file" : "lib/URI/snews.pm",
+         "version" : "6.06"
+      },
+      "URI::ssh" : {
+         "file" : "lib/URI/ssh.pm",
+         "version" : "6.06"
+      },
+      "URI::telnet" : {
+         "file" : "lib/URI/telnet.pm",
+         "version" : "6.06"
+      },
+      "URI::tn3270" : {
+         "file" : "lib/URI/tn3270.pm",
+         "version" : "6.06"
+      },
+      "URI::urn" : {
+         "file" : "lib/URI/urn.pm",
+         "version" : "6.06"
+      },
+      "URI::urn::isbn" : {
+         "file" : "lib/URI/urn/isbn.pm",
+         "version" : "6.06"
+      },
+      "URI::urn::oid" : {
+         "file" : "lib/URI/urn/oid.pm",
+         "version" : "6.06"
+      }
+   },
    "release_status" : "stable",
    "resources" : {
       "bugtracker" : {
@@ -83,6 +272,493 @@
       "x_MailingList" : "mailto:libwww@perl.org"
    },
    "version" : "6.06",
+   "x_Dist_Zilla" : {
+      "perl" : {
+         "version" : "5.024001"
+      },
+      "plugins" : [
+         {
+            "class" : "Dist::Zilla::Plugin::Git::GatherDir",
+            "config" : {
+               "Dist::Zilla::Plugin::GatherDir" : {
+                  "exclude_filename" : [
+                     "LICENSE",
+                     "META.json",
+                     "Makefile.PL",
+                     "README.md"
+                  ],
+                  "exclude_match" : [],
+                  "follow_symlinks" : 0,
+                  "include_dotfiles" : 0,
+                  "prefix" : "",
+                  "prune_directory" : [],
+                  "root" : "."
+               },
+               "Dist::Zilla::Plugin::Git::GatherDir" : {
+                  "include_untracked" : 0
+               }
+            },
+            "name" : "Git::GatherDir",
+            "version" : "2.041"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PruneCruft",
+            "name" : "PruneCruft",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaConfig",
+            "name" : "MetaConfig",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaProvides::Package",
+            "config" : {
+               "Dist::Zilla::Plugin::MetaProvides::Package" : {
+                  "finder_objects" : [
+                     {
+                        "class" : "Dist::Zilla::Plugin::FinderCode",
+                        "name" : "MetaProvides::Package/AUTOVIV/:InstallModulesPM",
+                        "version" : "6.009"
+                     }
+                  ],
+                  "include_underscores" : 0
+               },
+               "Dist::Zilla::Role::MetaProvider::Provider" : {
+                  "$Dist::Zilla::Role::MetaProvider::Provider::VERSION" : "2.002003",
+                  "inherit_missing" : "1",
+                  "inherit_version" : "1",
+                  "meta_noindex" : "1"
+               },
+               "Dist::Zilla::Role::ModuleMetadata" : {
+                  "Module::Metadata" : "1.000031",
+                  "version" : "0.004"
+               }
+            },
+            "name" : "MetaProvides::Package",
+            "version" : "2.004002"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaNoIndex",
+            "name" : "MetaNoIndex",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaYAML",
+            "name" : "MetaYAML",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaJSON",
+            "name" : "MetaJSON",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaResources",
+            "name" : "MetaResources",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Tag",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Tag" : {
+                  "branch" : null,
+                  "changelog" : "Changes",
+                  "signed" : 0,
+                  "tag" : "v6.06",
+                  "tag_format" : "v%v",
+                  "tag_message" : "v%v"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.0 (Apple Git-81)",
+                  "repo_root" : "."
+               },
+               "Dist::Zilla::Role::Git::StringFormatter" : {
+                  "time_zone" : "local"
+               }
+            },
+            "name" : "@Filter/Tag",
+            "version" : "2.041"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Push",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Push" : {
+                  "push_to" : [
+                     "origin"
+                  ],
+                  "remotes_must_exist" : 1
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.0 (Apple Git-81)",
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@Filter/Push",
+            "version" : "2.041"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Check",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Check" : {
+                  "untracked_files" : "die"
+               },
+               "Dist::Zilla::Role::Git::DirtyFiles" : {
+                  "allow_dirty" : [
+                     "Changes",
+                     "LICENSE",
+                     "META.json",
+                     "Makefile.PL",
+                     "README.md",
+                     "dist.ini"
+                  ],
+                  "allow_dirty_match" : [],
+                  "changelog" : "Changes"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.0 (Apple Git-81)",
+                  "repo_root" : "."
+               }
+            },
+            "name" : "Git::Check",
+            "version" : "2.041"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Commit",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Commit" : {
+                  "add_files_in" : [],
+                  "commit_msg" : "v%v%n%n%c"
+               },
+               "Dist::Zilla::Role::Git::DirtyFiles" : {
+                  "allow_dirty" : [
+                     "Changes",
+                     "LICENSE",
+                     "META.json",
+                     "Makefile.PL",
+                     "README.md",
+                     "dist.ini"
+                  ],
+                  "allow_dirty_match" : [],
+                  "changelog" : "Changes"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "git --version" : "2.11.0 (Apple Git-81)",
+                  "repo_root" : "."
+               },
+               "Dist::Zilla::Role::Git::StringFormatter" : {
+                  "time_zone" : "local"
+               }
+            },
+            "name" : "Git::Commit",
+            "version" : "2.041"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Contributors",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Contributors" : {
+                  "git --version" : "2.11.0 (Apple Git-81)",
+                  "include_authors" : 0,
+                  "include_releaser" : 1,
+                  "order_by" : "name",
+                  "paths" : []
+               }
+            },
+            "name" : "Git::Contributors",
+            "version" : "0.029"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::GithubMeta",
+            "name" : "GithubMeta",
+            "version" : "0.54"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Authority",
+            "name" : "Authority",
+            "version" : "1.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Manifest",
+            "name" : "Manifest",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::License",
+            "name" : "License",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+            "config" : {
+               "Dist::Zilla::Role::FileWatcher" : {
+                  "version" : "0.006"
+               }
+            },
+            "name" : "Markdown_Readme",
+            "version" : "0.163250"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ExecDir",
+            "name" : "ExecDir",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PkgVersion",
+            "name" : "PkgVersion",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::NextRelease",
+            "name" : "NextRelease",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs::FromCPANfile",
+            "name" : "Prereqs::FromCPANfile",
+            "version" : "0.08"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MakeMaker::Awesome",
+            "config" : {
+               "Dist::Zilla::Role::TestRunner" : {
+                  "default_jobs" : 1
+               }
+            },
+            "name" : "MakeMaker::Awesome",
+            "version" : "0.38"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::TestRelease",
+            "name" : "TestRelease",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ConfirmRelease",
+            "name" : "ConfirmRelease",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::UploadToCPAN",
+            "name" : "UploadToCPAN",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CheckChangeLog",
+            "name" : "CheckChangeLog",
+            "version" : "0.02"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CheckChangesHasContent",
+            "name" : "CheckChangesHasContent",
+            "version" : "0.010"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MojibakeTests",
+            "name" : "MojibakeTests",
+            "version" : "0.8"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::Version",
+            "name" : "Test::Version",
+            "version" : "1.09"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs",
+            "name" : "Test::ReportPrereqs",
+            "version" : "0.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::Compile",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::Compile" : {
+                  "bail_out_on_fail" : "1",
+                  "fail_on_warning" : "author",
+                  "fake_home" : 0,
+                  "filename" : "xt/author/00-compile.t",
+                  "module_finder" : [
+                     ":InstallModules"
+                  ],
+                  "needs_display" : 0,
+                  "phase" : "develop",
+                  "script_finder" : [
+                     ":PerlExecFiles"
+                  ],
+                  "skips" : [],
+                  "switch" : []
+               }
+            },
+            "name" : "Test::Compile",
+            "version" : "2.056"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::Portability",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::Portability" : {
+                  "options" : ""
+               }
+            },
+            "name" : "Test::Portability",
+            "version" : "2.001000"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::EOL",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::EOL" : {
+                  "filename" : "xt/author/eol.t",
+                  "finder" : [
+                     ":ExecFiles",
+                     ":InstallModules",
+                     ":TestFiles"
+                  ],
+                  "trailing_whitespace" : 1
+               }
+            },
+            "name" : "Test::EOL",
+            "version" : "0.19"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaTests",
+            "name" : "MetaTests",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent",
+            "name" : "Test::ChangesHasContent",
+            "version" : "0.010"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::MinimumVersion",
+            "name" : "Test::MinimumVersion",
+            "version" : "2.000007"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
+            "name" : "PodSyntaxTests",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable",
+            "name" : "Test::Pod::Coverage::Configurable",
+            "version" : "0.06"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::PodSpelling",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::PodSpelling" : {
+                  "directories" : [
+                     "bin",
+                     "lib"
+                  ],
+                  "spell_cmd" : "aspell list",
+                  "stopwords" : [
+                     "Berners",
+                     "IDNA",
+                     "ISBNs",
+                     "Masinter",
+                     "OIDs",
+                     "OpenLDAP",
+                     "Punycode",
+                     "TCP",
+                     "TLS",
+                     "UDP",
+                     "UNC",
+                     "etype",
+                     "evalue",
+                     "lowercasing",
+                     "relativize",
+                     "uppercasing"
+                  ],
+                  "wordlist" : "Pod::Wordlist"
+               }
+            },
+            "name" : "Test::PodSpelling",
+            "version" : "2.007004"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::RunExtraTests",
+            "config" : {
+               "Dist::Zilla::Role::TestRunner" : {
+                  "default_jobs" : 1
+               }
+            },
+            "name" : "RunExtraTests",
+            "version" : "0.029"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CheckStrictVersion",
+            "name" : "CheckStrictVersion",
+            "version" : "0.001"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild",
+            "name" : "CopyFilesFromBuild",
+            "version" : "0.163040"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":InstallModules",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":IncModules",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":TestFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ExtraTestFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ExecFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":PerlExecFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ShareFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":MainModule",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":AllFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":NoFiles",
+            "version" : "6.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : "MetaProvides::Package/AUTOVIV/:InstallModulesPM",
+            "version" : "6.009"
+         }
+      ],
+      "zilla" : {
+         "class" : "Dist::Zilla::Dist::Builder",
+         "config" : {
+            "is_trial" : "0"
+         },
+         "version" : "6.009"
+      }
+   },
+   "x_authority" : "cpan:LWWWP",
    "x_contributors" : [
       "Adam Herzog <adam@adamherzog.com>",
       "Alex Kapranoff <kapranoff@gmail.com>",
@@ -110,6 +786,6 @@
       "Torsten F\u00f6rtsch <torsten.foertsch@gmx.net>",
       "Ville Skytt\u00e4 <ville.skytta@iki.fi>"
    ],
-   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0218"
+   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0225"
 }
 
diff --git a/Makefile.PL b/Makefile.PL
index 8beb1ed..1102888 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,9 +1,11 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.007.
+# This Makefile.PL for URI was generated by
+# Dist::Zilla::Plugin::MakeMaker::Awesome 0.38.
+# Don't edit it but the dist.ini and plugins used to construct it.
+
 use strict;
 use warnings;
 
 use 5.008001;
-
 use ExtUtils::MakeMaker;
 
 my %WriteMakefileArgs = (
@@ -17,7 +19,6 @@ my %WriteMakefileArgs = (
   "MIN_PERL_VERSION" => "5.008001",
   "NAME" => "URI",
   "PREREQ_PM" => {
-    "Business::ISBN" => 0,
     "Carp" => 0,
     "Cwd" => 0,
     "Data::Dumper" => 0,
@@ -31,9 +32,12 @@ my %WriteMakefileArgs = (
     "overload" => 0,
     "parent" => 0,
     "strict" => 0,
+    "utf8" => 0,
     "warnings" => 0
   },
   "TEST_REQUIRES" => {
+    "ExtUtils::MakeMaker" => 0,
+    "File::Spec" => 0,
     "File::Spec::Functions" => 0,
     "File::Temp" => 0,
     "Storable" => 0,
@@ -47,45 +51,14 @@ my %WriteMakefileArgs = (
   }
 );
 
-
-<<<<<<< HEAD
-    META_ADD => {
-        prereqs => {
-            configure => {
-                requires => {
-                    'ExtUtils::MakeMaker' => '0',
-                },
-            },
-            runtime => {
-                requires => {
-                    'MIME::Base64'  => '2',
-                    'parent'        => '0',
-                    'Exporter'      => '5.57',
-                    'utf8'          => '0',
-                    'Scalar::Util'  => '0',
-                    'perl'          => '5.008001',
-                },
-                recommends => {
-                    'Business::ISBN' => '0',
-                },
-            },
-            test => {
-                requires => {
-                    'Test::More' => '0.96',
-                    'File::Temp' => '0',
-                    'Test::Needs' => '0',
-                },
-            },
-        },
-    },
-=======
 my %FallbackPrereqs = (
-  "Business::ISBN" => 0,
   "Carp" => 0,
   "Cwd" => 0,
   "Data::Dumper" => 0,
   "Encode" => 0,
   "Exporter" => "5.57",
+  "ExtUtils::MakeMaker" => 0,
+  "File::Spec" => 0,
   "File::Spec::Functions" => 0,
   "File::Temp" => 0,
   "MIME::Base64" => 2,
@@ -101,10 +74,8 @@ my %FallbackPrereqs = (
   "strict" => 0,
   "utf8" => 0,
   "warnings" => 0
->>>>>>> 726708c... Convert to dzil.
 );
 
-
 unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
   delete $WriteMakefileArgs{TEST_REQUIRES};
   delete $WriteMakefileArgs{BUILD_REQUIRES};
diff --git a/README.md b/README.md
index 150f451..8adce39 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,6 @@
 
 URI - Uniform Resource Identifiers (absolute and relative)
 
-[![Build Status](https://travis-ci.org/libwww-perl/URI.png?branch=master)](https://travis-ci.org/libwww-perl/URI)
-
-# VERSION
-
-version 6.06
-
 # SYNOPSIS
 
     $u1 = URI->new("http://www.perl.com");
@@ -728,6 +722,15 @@ Berners-Lee, Fielding, Masinter, August 1998.
 
 [http://www.w3.org/Addressing/](http://www.w3.org/Addressing/)
 
+# COPYRIGHT
+
+Copyright 1995-2009 Gisle Aas.
+
+Copyright 1995 Martijn Koster.
+
+This program is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
 # AUTHORS / ACKNOWLEDGMENTS
 
 This module is based on the `URI::URL` module, which in turn was
@@ -741,14 +744,3 @@ Martijn Koster with input from other people on the libwww-perl mailing
 list.
 
 `URI` and related subclasses was developed by Gisle Aas.
-
-# AUTHOR
-
-Gisle Aas <gisle@activestate.com>
-
-# COPYRIGHT AND LICENSE
-
-This software is copyright (c) 1995-2016 by Gisle Aas, Martijn Koster.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
diff --git a/cpanfile b/cpanfile
index e2972a3..3353ed0 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,41 +1,36 @@
-requires "Business::ISBN" => "0";
-requires "Carp" => "0";
-requires "Cwd" => "0";
-requires "Data::Dumper" => "0";
-requires "Encode" => "0";
-requires "Exporter" => "5.57";
-requires "MIME::Base64" => "2";
-requires "Net::Domain" => "0";
-requires "Scalar::Util" => "0";
-requires "constant" => "0";
-requires "integer" => "0";
-requires "overload" => "0";
-requires "parent" => "0";
-requires "perl" => "5.008001";
-requires "strict" => "0";
-requires "warnings" => "0";
-
-on 'test' => sub {
-  requires "File::Spec::Functions" => "0";
-  requires "File::Temp" => "0";
-  requires "Storable" => "0";
-  requires "Test" => "0";
-  requires "Test::More" => "0";
-  requires "utf8" => "0";
-};
-
-on 'test' => sub {
-  recommends "Business::ISBN" => "0";
+on 'configure' => sub {
+    requires "ExtUtils::MakeMaker" => "0";
+    suggests "JSON::PP" => "2.27300";
 };
 
-on 'configure' => sub {
-  requires "ExtUtils::MakeMaker" => "0";
+on 'develop' => sub {
+    requires "Test::CPAN::Changes" => "0.19";
 };
 
-on 'configure' => sub {
-  suggests "JSON::PP" => "2.27300";
+on 'runtime' => sub {
+    requires "Carp" => "0";
+    requires "Cwd" => "0";
+    requires "Data::Dumper" => "0";
+    requires "Encode" => "0";
+    requires "Exporter" => "5.57";
+    requires "MIME::Base64" => "2";
+    requires "Net::Domain" => "0";
+    requires "Scalar::Util" => "0";
+    requires "constant" => "0";
+    requires "integer" => "0";
+    requires "overload" => "0";
+    requires "parent" => "0";
+    requires "perl" => "5.008001";
+    requires "strict" => "0";
+    requires "warnings" => "0";
+    requires "utf8" => '0';
 };
 
-on 'develop' => sub {
-  requires "Test::CPAN::Changes" => "0.19";
+on 'test' => sub {
+    requires "File::Spec::Functions" => "0";
+    requires "File::Temp" => "0";
+    requires "Storable" => "0";
+    requires "Test" => "0";
+    requires "Test::More" => "0";
+    requires "utf8" => "0";
 };
diff --git a/dist.ini b/dist.ini
index 73b6c7d..a01d3e0 100644
--- a/dist.ini
+++ b/dist.ini
@@ -6,33 +6,165 @@ copyright_holder = Gisle Aas, Martijn Koster
 copyright_year   = 1995-2016
 version = 6.06
 
+; Gather stuff in
+[Git::GatherDir]
+exclude_filename = LICENSE
+exclude_filename = META.json
+exclude_filename = Makefile.PL
+exclude_filename = README.md
+[PruneCruft]
+
+; Handle the META resources
+[MetaConfig]
+[MetaProvides::Package]
+[MetaNoIndex]
+directory = t
+directory = xt
+[MetaYAML]
+[MetaJSON]
 [MetaResources]
 x_IRC = irc://irc.perl.org/#lwp
 x_MailingList = mailto:libwww@perl.org
 
-[Prereqs]
-Exporter      = 5.57
-MIME::Base64  = 2
-parent        = 0
-perl = 5.008001
-
-[Prereqs / TestRecommends]
-Business::ISBN = 0
-
-[Encoding]
-encoding = ISO-8859-1
-filename = t/data.t
-filename = t/escape.t
-filename = t/http.t
-filename = t/old-base.t
-filename = t/pop.t
-filename = t/rtsp.t
-
-[@Author::OALDERS]
--remove = MinimumPerl
--remove = PodCoverageTests
--remove = Prereqs
--remove = Test::Perl::Critic
--remove = Test::PodSpelling
--remove = Test::Synopsis
--remove = Test::TidyAll
+[@Filter]
+-bundle = @Git
+-remove = Git::Check
+-remove = Git::Commit
+
+[Git::Check]
+allow_dirty = Changes
+allow_dirty = dist.ini
+allow_dirty = LICENSE
+allow_dirty = META.json
+allow_dirty = Makefile.PL
+allow_dirty = README.md
+
+[Git::Commit]
+allow_dirty = Changes
+allow_dirty = dist.ini
+allow_dirty = LICENSE
+allow_dirty = META.json
+allow_dirty = Makefile.PL
+allow_dirty = README.md
+
+[Git::Contributors]
+[GithubMeta]
+issues = 1
+user = libwww-perl
+[Authority]
+do_munging = 0
+authority = cpan:LWWWP
+[Manifest]
+[License]
+
+; Create Readme
+[ReadmeAnyFromPod / Markdown_Readme]
+source_filename = lib/URI.pm
+type = markdown
+filename = README.md
+location = root
+
+; make the bin dir executables
+[ExecDir]
+; [ShareDir]
+
+; Handle Versioning
+[PkgVersion]
+[NextRelease]
+format = %-9v %{yyyy-MM-dd}d
+
+[Prereqs::FromCPANfile]
+
+[MakeMaker::Awesome]
+
+[TestRelease]
+[ConfirmRelease]
+[UploadToCPAN]
+[CheckChangeLog]
+[CheckChangesHasContent]
+; TODO strict and warnings to quiet the kwalitee tests
+; [Test::Kwalitee]
+; filename = xt/author/kwalitee.t
+[MojibakeTests]
+[Test::Version]
+[Test::ReportPrereqs]
+[Test::Compile]
+bail_out_on_fail = 1
+xt_mode = 1
+
+[Test::Portability]
+; TODO perltidy for NoTabs and namespace::autoclean
+; [Test::CleanNamespaces] ; TODO
+; [Test::NoTabs] ; TODO
+[Test::EOL]
+[MetaTests]
+[Test::ChangesHasContent]
+[Test::MinimumVersion]
+[PodSyntaxTests]
+
+[Test::Pod::Coverage::Configurable]
+skip = URI::IRI
+skip = URI::_foreign
+skip = URI::_idna
+skip = URI::_login
+skip = URI::_ldap
+skip = URI::file::QNX
+skip = URI::nntp
+skip = URI::urn::isbn
+skip = URI::urn::oid
+skip = URI::sftp
+trustme = URI => qr/^(?:STORABLE_freeze|STORABLE_thaw|TO_JSON|implementor)$/
+trustme = URI::Escape => qr/^(?:escape_char)$/
+trustme = URI::Heuristic => qr/^(?:MY_COUNTRY|uf_url|uf_urlstr)$/
+trustme = URI::URL => qr/^(?:address|article|crack|dos_path|encoded822addr|eparams|epath|frag)$/
+trustme = URI::URL => qr/^(?:full_path|groupart|keywords|local_path|mac_path|netloc|newlocal|params|path|path_components|print_on|query|strict|unix_path|url|vms_path)$/
+trustme = URI::WithBase => qr/^(?:can|clone|eq|new_abs)$/
+trustme = URI::_punycode => qr/^(?:adapt|code_point|digit_value|min)$/
+trustme = URI::_query => qr/^(?:equery|query|query_form|query_form_hash|query_keywords|query_param|query_param_append|query_param_delete)$/
+trustme = URI::_segment => qr/^(?:new)$/
+trustme = URI::_userpass => qr/^(?:password|user)$/
+trustme = URI::file => qr/^(?:os_class)$/
+trustme = URI::file::Base => qr/^(?:dir|file|new)$/
+trustme = URI::file::FAT => qr/^(?:fix_path)$/
+trustme = URI::file::Mac => qr/^(?:dir|file)$/
+trustme = URI::file::OS2 => qr/^(?:file)$/
+trustme = URI::file::Unix => qr/^(?:file)$/
+trustme = URI::file::Win32 => qr/^(?:file|fix_path)$/
+trustme = URI::ftp => qr/^(?:password|user)$/
+trustme = URI::gopher => qr/^(?:gopher_type|gtype|search|selector|string)$/
+trustme = URI::ldapi => qr/^(?:un_path)$/
+trustme = URI::mailto => qr/^(?:headers|to)$/
+trustme = URI::news => qr/^(?:group|message)$/
+trustme = URI::pop => qr/^(?:auth|user)$/
+trustme = URI::sip => qr/^(?:params|params_form)$/
+trustme = URI::urn => qr/^(?:nid|nss)$/
+
+[Test::PodSpelling]
+wordlist = Pod::Wordlist
+spell_cmd = aspell list
+stopword = Berners
+stopword = ISBNs
+stopword = Masinter
+stopword = OIDs
+stopword = TCP
+stopword = TLS
+stopword = UDP
+stopword = UNC
+stopword = lowercasing
+stopword = relativize
+stopword = uppercasing
+stopword = IDNA
+stopword = OpenLDAP
+stopword = etype
+stopword = evalue
+stopword = Punycode
+
+[RunExtraTests]
+
+[CheckStrictVersion]
+decimal_only = 1
+
+[CopyFilesFromBuild]
+copy = Makefile.PL
+copy = META.json
+copy = LICENSE