Skip to content

Commit

Permalink
[grid] Temporarily avoiding an extra jar merging
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
diemol committed Oct 20, 2022
1 parent 1502505 commit fcc4df1
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions java/src/org/openqa/selenium/grid/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ genrule(
name = "executable-grid",
srcs = [
"zip-preamble.sh",
":add-build-info",
":selenium_server_deploy.jar",
],
outs = ["selenium"],
cmd = "cat $(location :zip-preamble.sh) $(location :add-build-info) > $@",
cmd = "cat $(location :zip-preamble.sh) $(location :selenium_server_deploy.jar) > $@",
executable = True,
visibility = [
"//:__pkg__",
Expand Down Expand Up @@ -137,6 +137,10 @@ merge_jars(

java_binary(
name = "selenium_server",
deploy_manifest_lines = [
"Name: Build-Info",
"Selenium-Version: %s" % SE_VERSION,
],
main_class = "org.openqa.selenium.grid.Bootstrap",
visibility = [
"//:__pkg__",
Expand Down

0 comments on commit fcc4df1

Please sign in to comment.