Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/ruby/Rakefile

 require "rubygems"
 require "rubygems/package_task"
 require "rake/extensiontask" unless RUBY_PLATFORM == "java"
 require "rake/testtask"
 
 spec = Gem::Specification.load("google-protobuf.gemspec")
 
 well_known_protos = %w[
   google/protobuf/any.proto
   google/protobuf/api.proto
@@ skipping 13 matching lines @@
   google/protobuf/compiler/plugin.proto
 ]
 
 genproto_output = []
 
 # We won't have access to .. from within docker, but the proto files
 # will be there, thanks to the :genproto rule dependency for gem:native.
 unless ENV['IN_DOCKER'] == 'true'
   well_known_protos.each do |proto_file|
     input_file = "../src/" + proto_file
-    output_file = "lib/" + proto_file.sub(/\.proto$/, "_pb.rb")
+    output_file = "lib/" + proto_file.sub(/\.proto$/, ".rb")
     genproto_output << output_file
     file output_file => input_file do |file_task|
       sh "../src/protoc -I../src --ruby_out=lib #{input_file}"
     end
   end
 end
 
 if RUBY_PLATFORM == "java"
   if `which mvn` == ''
     raise ArgumentError, "maven needs to be installed"
   end
   task :clean do
-    system("mvn --batch-mode clean")
+    system("mvn clean")
   end
 
   task :compile do
-    system("mvn --batch-mode package")
+    system("mvn package")
   end
 else
   Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
     ext.ext_dir = "ext/google/protobuf_c"
     ext.lib_dir = "lib/google"
     ext.cross_compile = true
     ext.cross_platform = [
       'x86-mingw32', 'x64-mingw32',
       'x86_64-linux', 'x86-linux',
       'universal-darwin'
@@ skipping 11 matching lines @@
       system "rake cross native gem RUBY_CC_VERSION=2.3.0:2.2.2:2.1.5:2.0.0"
     end
   else
     task 'gem:native' => [:genproto, 'gem:windows']
   end
 end
 
 
 # Proto for tests.
 genproto_output << "tests/generated_code.rb"
-genproto_output << "tests/test_import.rb"
 file "tests/generated_code.rb" => "tests/generated_code.proto" do |file_task|
   sh "../src/protoc --ruby_out=. tests/generated_code.proto"
 end
 
-file "tests/test_import.rb" => "tests/test_import.proto" do |file_task|
-  sh "../src/protoc --ruby_out=. tests/test_import.proto"
-end
-
 task :genproto => genproto_output
 
 task :clean do
   sh "rm -f #{genproto_output.join(' ')}"
 end
 
 Gem::PackageTask.new(spec) do |pkg|
 end
 
 Rake::TestTask.new(:test => :build) do |t|
   t.test_files = FileList["tests/*.rb"]
 end
 
 task :build => [:clean, :compile, :genproto]
 task :default => [:build]
 
 # vim:sw=2:et