Last tweaks

Rakefile

@@ -254,14 +254,6 @@ else
     lib.vendor_lib = "lib/bundler/vendor/fileutils"
   end
 
-  desc "Vendor a specific version of uri"
-  Automatiek::RakeTask.new("uri") do |lib|
-    lib.download = { :github => "https://github.com/ruby/uri" }
-    lib.namespace = "URI"
-    lib.prefix = "Bundler"
-    lib.vendor_lib = "lib/bundler/vendor/uri"
-  end
-
   # We currently cherry-pick changes to use `require_relative` internally
   # instead of regular `require`. They are pending review at
   # https://github.com/drbrain/net-http-persistent/pull/106
@@ -279,6 +271,14 @@ else
       sublib.prefix = "Bundler"
       sublib.vendor_lib = "lib/bundler/vendor/connection_pool"
     end
+
+    lib.dependency("uri") do |sublib|
+      sublib.version = "master"
+      sublib.download = { :github => "https://github.com/ruby/uri" }
+      sublib.namespace = "URI"
+      sublib.prefix = "Bundler"
+      sublib.vendor_lib = "lib/bundler/vendor/uri"
+    end
   end
 end
 

lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb

@@ -688,14 +688,14 @@ def error_message connection
   end
 
   ##
-  # URI::escape wrapper
+  # Bundler::URI::escape wrapper
 
   def escape str
     CGI.escape str if str
   end
 
   ##
-  # URI::unescape wrapper
+  # Bundler::URI::unescape wrapper
 
   def unescape str
     CGI.unescape str if str
@@ -817,7 +817,6 @@ def private_key= key
   # <tt>example.com,some.host:8080</tt>.
 
   def proxy= proxy
-    require_relative "../../../../../vendored_uri"
     @proxy_uri = case proxy
                  when :ENV      then proxy_from_env
                  when Bundler::URI::HTTP then proxy