Use update travis build tools.

Author: wparad

Gemfile.lock

@@ -19,7 +19,7 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rubyzip (1.1.7)
-    travis-build-tools (1.0.30.0)
+    travis-build-tools (2.0.48.0)
       bundler (~> 1.10)
       rest-client (~> 1.8)
       rubyzip (~> 1.1)

rakefile.rb

@@ -34,7 +34,7 @@
 desc 'Creates eclipse project'
 task :project
 
-task :after_build => [:publish_git_tag, :display_repository]
+task :after_build => [:publish_git_tag, :display_repository, :merge_downstream]
 
 task :clobber => [:clean]
 CLOBBER.include(TARGET_DIR, AMPS_DIR)
@@ -76,16 +76,19 @@ def download_file(local_path, remote_location)
   File.write(pom_xml, document.to_s)
 end
 
-publish_git_tag :publish_git_tag do |t, args|
-  t.git_repository = %x[git config --get remote.origin.url].split('://')[1]
-  t.tag_name = TravisBuildTools::Build::VERSION
-  t.service_user = ENV['GIT_TAG_PUSHER']
-end
-
 task :display_repository do
   puts Dir.glob(File.join(PWD, '**', '*'), File::FNM_DOTMATCH).select{|f| !f.match(/\/(\.git|vendor|bundle)\//)}
 end
 
+BUILDER = TravisBuildTools::Builder.new(ENV['GIT_TAG_PUSHER'] || ENV['USER'])
+task :publish_git_tag do
+  BUILDER.publish_git_tag(TravisBuildTools::Build::VERSION.to_s)
+end
+
+task :merge_downstream do
+  BUILDER.merge_downstream('release/', 'master')
+end
+
 task :compile do
   cmd = 'mvn -DdownloadSources=trueclean compile assembly:single'
   system(cmd)