Skip to content

Commit fcc4df1

Browse files
committed
[grid] Temporarily avoiding an extra jar merging
We are having issues while adding extra build info into the MANIFEST.MF file while building the final jar for Grid. This commit avoids the extra jar merging that is producing this issue, and we will likely revert this after we figure out how to solve it. This was done to unblock the 4.5.1 release. The MANIFEST.MF will be missing the git revision and the date, but that information will be present in the selenium-build.properties file anyway.
1 parent 1502505 commit fcc4df1

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

java/src/org/openqa/selenium/grid/BUILD.bazel

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ genrule(
88
name = "executable-grid",
99
srcs = [
1010
"zip-preamble.sh",
11-
":add-build-info",
11+
":selenium_server_deploy.jar",
1212
],
1313
outs = ["selenium"],
14-
cmd = "cat $(location :zip-preamble.sh) $(location :add-build-info) > $@",
14+
cmd = "cat $(location :zip-preamble.sh) $(location :selenium_server_deploy.jar) > $@",
1515
executable = True,
1616
visibility = [
1717
"//:__pkg__",
@@ -137,6 +137,10 @@ merge_jars(
137137

138138
java_binary(
139139
name = "selenium_server",
140+
deploy_manifest_lines = [
141+
"Name: Build-Info",
142+
"Selenium-Version: %s" % SE_VERSION,
143+
],
140144
main_class = "org.openqa.selenium.grid.Bootstrap",
141145
visibility = [
142146
"//:__pkg__",

0 commit comments

Comments
 (0)