gistfile1.txt

$ git diff rakelib/artifacts.rake
diff --git a/rakelib/artifacts.rake b/rakelib/artifacts.rake
index 5cf5321..9ee527e 100644
--- a/rakelib/artifacts.rake
+++ b/rakelib/artifacts.rake
@@ -10,18 +10,14 @@ namespace "artifact" do
     "CONTRIBUTORS",
     "{bin,lib,spec,locales}/{,**/*}",
     "patterns/**/*",
-    "vendor/elasticsearch/**/*",
-    "vendor/collectd/**/*",
-    "vendor/jruby/**/*",
-    "vendor/kafka/**/*",
-    "vendor/geoip/**/*",
+    "vendor/**/*",
     File.join(LogStash::Environment.gem_home.gsub(Dir.pwd + "/", ""), "{gems,specifications}/**/*"),
     "Rakefile",
     "rakelib/*",
   ]

   desc "Build a tar.gz of logstash with all dependencies"
-  task "tar" => ["vendor:elasticsearch", "vendor:collectd", "vendor:jruby", "vendor:gems"] do
+  task "tar" => ["bootstrap"] do
     Rake::Task["dependency:archive-tar-minitar"].invoke
     require "zlib"
     require "archive/tar/minitar"

gistfile2.txt

$ git diff rakelib/vendor.rake
diff --git a/rakelib/vendor.rake b/rakelib/vendor.rake
index bcd2489..069e476 100644
--- a/rakelib/vendor.rake
+++ b/rakelib/vendor.rake
@@ -223,7 +223,7 @@ namespace "vendor" do
         # was told to stop using the bundler ruby api. Oh well :(
         bundler = File.join(Gem.bindir, "bundle")
         jruby = File.join("vendor", "jruby", "bin", "jruby")
-        cmd = [jruby,  bundler, "install", "--gemfile=tools/Gemfile", "--path", LogStash::Environment.gem_home, "--clean", "--without", "development", "--jobs", "4"]
+        cmd = [jruby,  bundler, "install", "--gemfile=tools/Gemfile", "--path", LogStash::Environment::BUNDLE_DIR, "--clean", "--standalone", "--without", "development", "--jobs", "4"]
         system(*cmd)
         raise $! unless $?.success?
         break