Extract a new build target for building the release zips

And restoring the deploy of artifacts to maven central.

Author: shs96c

Rakefile

@@ -50,7 +50,7 @@ def release_version
 end
 
 def version
-  "#{release_version}.0-beta2"
+  "#{release_version}.0-beta3"
 end
 
 ide_version = "2.8.0"
@@ -446,55 +446,6 @@ file "build/third_party/java/jetty/jetty-repacked.jar" => [
    cp "build/third_party/java/jetty/jetty-repacked.jar", "third_party/java/jetty/jetty-repacked.jar"
 end
 
-#task "release" => [
-#    :clean,
-#    :build,
-#    '//java/server/src/org/openqa/selenium/remote/server:server:zip',
-#    '//java/server/src/org/openqa/grid/selenium:selenium:zip',
-#    '//java/client/src/org/openqa/selenium:client-combined-v3:zip',
-#  ] do |t|
-#  # Unzip each of the deps and rename the pieces that need renaming
-#  renames = {
-#    "client-combined-v3-nodeps-srcs.jar" => "selenium-java-#{version}-srcs.jar",
-#    "client-combined-v3-nodeps.jar" => "selenium-java-#{version}.jar",
-#    "selenium-nodeps-srcs.jar" => "selenium-server-#{version}-srcs.jar",
-#    "selenium-nodeps.jar" => "selenium-server-#{version}.jar",
-#    "selenium-standalone.jar" => "selenium-server-standalone-#{version}.jar",
-#  }
-#
-#  t.prerequisites.each do |pre|
-#    zip = Rake::Task[pre].out
-#
-#    next unless zip =~ /\.zip$/
-#
-#    temp =  zip + "rename"
-#    rm_rf temp
-#    deep = File.join(temp, "/selenium-#{version}")
-#    mkdir_p deep
-#    cp "java/CHANGELOG", deep
-#    cp "NOTICE", deep
-#    cp "LICENSE", deep
-#
-#    sh "cd #{deep} && jar xf ../../#{File.basename(zip)}"
-#    renames.each do |from, to|
-#      src = File.join(deep, from)
-#      next unless File.exists?(src)
-#
-#      mv src, File.join(deep, to)
-#    end
-#    rm_f File.join(deep, "client-combined-v3-standalone.jar")
-#    rm zip
-#    sh "cd #{temp} && jar cMf ../#{File.basename(zip)} *"
-#
-#    rm_rf temp
-#  end
-#
-#  mkdir_p "build/dist"
-#  cp "build/java/server/src/org/openqa/grid/selenium/selenium-standalone.jar", "build/dist/selenium-server-standalone-#{version}.jar"
-#  cp "build/java/server/src/org/openqa/grid/selenium/selenium.zip", "build/dist/selenium-server-#{version}.zip"
-#  cp "build/java/client/src/org/openqa/selenium/client-combined-v3.zip", "build/dist/selenium-java-#{version}.zip"
-#end
-
 
 task :'maven-dry-run' => JAVA_RELEASE_TARGETS do |t|
   t.prerequisites.each do |p|
@@ -505,19 +456,10 @@ task :'maven-dry-run' => JAVA_RELEASE_TARGETS do |t|
 end
 
 
-task :release => JAVA_RELEASE_TARGETS + [
-  # Until we mananage to migrate to Buck entirely.
+task :'prep-release-zip' => [
   '//java/client/src/org/openqa/selenium:client-combined:zip',
   '//java/server/src/org/openqa/grid/selenium:selenium:zip',
-  '//java/server/src/org/openqa/selenium/server/htmlrunner:selenium-runner',
- ] do |t|
-  puts t.prerequisites.join(', ')
-
-# t.prerequisites.each do |p|
-#   if JAVA_RELEASE_TARGETS.include?(p)
-#     Buck::buck_cmd.call('publish', ['--dry-run', '--remote-repo', 'https://oss.sonatype.org/service/local/staging/deploy/maven2', p])
-#   end
-# end
+  '//java/server/src/org/openqa/selenium/server/htmlrunner:selenium-runner'] do |t|
 
   mkdir_p "build/dist"
   cp Rake::Task['//java/server/src/org/openqa/grid/selenium:selenium'].out, "build/dist/selenium-server-standalone-#{version}.jar"
@@ -530,6 +472,17 @@ task :release => JAVA_RELEASE_TARGETS + [
   cp Rake::Task['//java/server/src/org/openqa/selenium/server/htmlrunner:selenium-runner'].out, "build/dist/selenium-html-runner-#{version}.jar"
 end
 
+
+task :release => JAVA_RELEASE_TARGETS + ['prep-release-zip'] do |t|
+  puts t.prerequisites.join(', ')
+
+ t.prerequisites.each do |p|
+   if JAVA_RELEASE_TARGETS.include?(p)
+     Buck::buck_cmd.call('publish', ['--dry-run', '--remote-repo', 'https://oss.sonatype.org/service/local/staging/deploy/maven2', p])
+   end
+ end
+end
+
 def read_user_pass_from_m2_settings
     settings = File.read(ENV['HOME'] + "/.m2/settings.xml")
     found_section = false
@@ -557,7 +510,6 @@ task :'publish-maven' do
   creds = read_user_pass_from_m2_settings()
   JAVA_RELEASE_TARGETS.each do |p|
     if JAVA_RELEASE_TARGETS.include?(p)
-      Buck::buck_cmd.call('build', [p])
       Buck::buck_cmd.call('publish', ['--remote-repo', 'https://oss.sonatype.org/service/local/staging/deploy/maven2', '--include-source', '--include-javadoc', '-u', creds[0], '-p', creds[1], '--signing-passphrase', passphrase, p])
     end
   end