Bump the buck version

Author: shs96c

.buckhash

@@ -1 +1 @@
-22583d6ee2a1fa513f0f86bf7c878771
+bdac818b2ac92c1987c8d19617665705

.buckversion

@@ -1 +1 @@
-be2bf932342e5d67f58c9b26f5065c745d285d0d
+8eca783ccd962d873c92c38b5b15b642e3f5e268

Rakefile

@@ -502,15 +502,15 @@ task :'publish-maven' => JAVA_RELEASE_TARGETS do
   creds = read_user_pass_from_m2_settings()
   JAVA_RELEASE_TARGETS.each do |p|
     if JAVA_RELEASE_TARGETS.include?(p)
-      Buck::buck_cmd('publish', ['--remote-repo', 'https://oss.sonatype.org/service/local/staging/deploy/maven2', '--include-source', '--include-docs', '-u', creds[0], '-p', creds[1], '--signing-passphrase', passphrase, p])
+      Buck::buck_cmd('publish', ['--stamp-build=detect', '--remote-repo', 'https://oss.sonatype.org/service/local/staging/deploy/maven2', '--include-source', '--include-docs', '-u', creds[0], '-p', creds[1], '--signing-passphrase', passphrase, p])
     end
   end
 end
 
 task :'maven-install' do
   JAVA_RELEASE_TARGETS.each do |p|
     if JAVA_RELEASE_TARGETS.include?(p)
-      Buck::buck_cmd('publish', ['--remote-repo', "file://#{ENV['HOME']}/.m2/repository", '--include-source', '--include-docs', p])
+      Buck::buck_cmd('publish', ['--stamp-build=detect', --remote-repo', "file://#{ENV['HOME']}/.m2/repository", '--include-source', '--include-docs', p])
     end
   end
 end

java/client/src/org/openqa/selenium/BUCK

@@ -1,11 +1,6 @@
 # BUILD FILE SYNTAX: SKYLARK
 load("//:selenium-version.bzl", "SE_VERSION")
 
-build_stamp(name = 'build-stamp',
-  kind = 'manifest',
-  source_control_system = 'git',
-)
-
 java_library(name = 'selenium',
   exported_deps = [
     ':beta',
@@ -85,8 +80,8 @@ java_library(name = 'core',
 
 genrule(name = 'manifest',
   out = 'manifest.mf',
-  bash = "cp $(location :build-stamp) $OUT && printf 'Selenium-Version: {}\n\n' >> $OUT".format(SE_VERSION),
-  cmd_exe = "copy $(location :build-stamp) %OUT% && (echo Selenium-Version: {}\n\n) >> %OUT%".format(SE_VERSION),
+  bash = "printf '\n\nName: Selenium\nSelenium-Version: {}\n\n' >> $OUT".format(SE_VERSION),
+  cmd_exe = "(echo \n\nName: Selenium\nSelenium-Version: {}\n\n) >> %OUT%".format(SE_VERSION),
 )
 
 java_library(name = 'beta',

java/client/src/org/openqa/selenium/interactions/BUCK

@@ -5,7 +5,7 @@ java_library(name = 'interactions',
     'KeyInput.java',
     'IsInteraction.java',
     'PointerInput.java',
-  ] + glob(['*Action.java', 'internal/*Action.java', 'touch/*.java'], excludes = ['Action.java', 'IsInteraction.java']),
+  ] + glob(['*Action.java', 'internal/*Action.java', 'touch/*.java'], exclude = ['Action.java', 'IsInteraction.java']),
   exported_deps = [
     ':core',
     ':exceptions',

java/client/src/org/openqa/selenium/internal/BuildInfo.java

@@ -80,6 +80,12 @@ private static Properties loadBuildProperties() {
       for (Entry<Object, Object> e : entries) {
         properties.put(String.valueOf(e.getKey()), String.valueOf(e.getValue()));
       }
+
+      attributes = manifest.getAttributes("Selenium");
+      entries = attributes.entrySet();
+      for (Entry<Object, Object> e : entries) {
+        properties.put(String.valueOf(e.getKey()), String.valueOf(e.getValue()));
+      }
     } catch (NullPointerException e) {
       // Fall through
     }

java/client/src/org/openqa/selenium/logging/BUCK

@@ -19,7 +19,7 @@ java_library(name = 'api',
 )
 
 java_library(name = 'logging',
-  srcs = glob(['*.java', 'profiler/*.java'], excludes = API_SRCS),
+  srcs = glob(['*.java', 'profiler/*.java'], exclude = API_SRCS),
   deps = [
     ':api',
     '//java/client/src/org/openqa/selenium:beta',

java/client/test/com/thoughtworks/selenium/webdriven/BUCK

@@ -28,7 +28,7 @@ java_test(name = 'small-tests',
 )
 
 java_library(name = 'tests',
-  srcs = glob(['*Test.java'], excludes = ['ScriptMutatorTest.java','WebDriverBackedSeleniumLargeTest.java']),
+  srcs = glob(['*Test.java'], exclude = ['ScriptMutatorTest.java','WebDriverBackedSeleniumLargeTest.java']),
   deps = [
     '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium:selenium',

java/client/test/org/openqa/selenium/environment/BUCK

@@ -1,6 +1,6 @@
 # BUILD FILE SYNTAX: SKYLARK
 java_library(name = 'environment',
-  srcs = glob(['*.java', 'webserver/*.java'], excludes = ['**/*Test.java']),
+  srcs = glob(['*.java', 'webserver/*.java'], exclude = ['**/*Test.java']),
   provided_deps = [
     '//third_party/java/servlet:javax.servlet-api',
   ],

java/server/src/org/openqa/grid/selenium/BUCK

@@ -5,7 +5,6 @@ load("//:selenium-version.bzl", "SE_VERSION")
 
 java_binary(name = 'selenium',
   main_class = 'org.openqa.grid.selenium.GridLauncherV3',
-  manifest_file = ':manifest',
   merge_manifests = True,
   deps = [
     ':classes',
@@ -15,21 +14,12 @@ java_binary(name = 'selenium',
   ]
 )
 
-genrule(name = 'manifest',
-  out = 'build-info.mf',
-  cmd = "$(exe :generate-build-info) %s > $OUT" % (SE_VERSION),
-)
-
-python_binary(name = 'generate-build-info',
-  main = 'generate-build-info.py',
-)
-
 java_library(name = 'classes',
   maven_coords = 'org.seleniumhq.selenium:selenium-server:' + SE_VERSION,
   maven_pom_template = '//java/client/src/org/openqa/selenium:template-pom',
   srcs = glob(
     ['**/*.java'],
-    excludes = ['node/**']),
+    exclude = ['node/**']),
   deps = [
     '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium:client-combined',