Skip to content

Commit e0e9c0d

Browse files
navin772navin772
authored
Merge branch 'trunk' into enable-history-updated-test-py
2 parents 1ed0b66 + 51db4f2 commit e0e9c0d

File tree

21 files changed

+568
-464
lines changed

21 files changed

+568
-464
lines changed

‎.github/label-commenter-config.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ labels:
117117
This is related to code in the Support packages. The support packages contain example code that
118118
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
119119
and the Selenium team is not prioritizing work on them right now.
120-
This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
120+
This doesn't mean that we won't ever work on them, but it is not on our long term roadmap.
121121
122122
We actively encourage people to create their own wrapper and helper code that makes sense for them.
123123
If you have any questions, please [contact us](https://www.selenium.dev/support)
@@ -127,10 +127,12 @@ labels:
127127
128128
The support packages contain example code that many users find helpful, but they do not necessarily represent
129129
the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
130+
131+
After reviewing the change, unless it is a critical fix or a feature that is needed for Selenium
132+
to work, we will likely close the PR.
130133
131134
We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
132135
If you have any questions, please [contact us](https://www.selenium.dev/support)
133-
action: close
134136
135137
136138

‎.github/renovate.json‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
11
{
2-
"labels": ["B-dependencies"]
2+
"labels": [
3+
"B-dependencies"
4+
],
5+
"docker": {
6+
"enabled": false
7+
},
8+
"packageRules": [
9+
{
10+
"matchDatasources": [
11+
"docker"
12+
],
13+
"enabled": false
14+
},
15+
{
16+
"matchPackagePatterns": [
17+
"^docker:",
18+
"^gcr.io/",
19+
"^registry.k8s.io/",
20+
"^quay.io/",
21+
"^ghcr.io/"
22+
],
23+
"enabled": false
24+
}
25+
]
326
}

‎MODULE.bazel‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.2.0", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2121
bazel_dep(name = "rules_java", version = "8.7.1")
22-
bazel_dep(name = "rules_jvm_external", version = "6.6")
22+
bazel_dep(name = "rules_jvm_external", version = "6.8")
2323
bazel_dep(name = "rules_multitool", version = "1.3.0")
2424
bazel_dep(name = "rules_nodejs", version = "6.3.2")
2525
bazel_dep(name = "rules_oci", version = "1.8.0")
@@ -29,12 +29,10 @@ bazel_dep(name = "rules_proto", version = "7.0.2")
2929
bazel_dep(name = "rules_ruby", version = "0.19.0")
3030

3131
# Until `rules_jvm_external` 6.8 ships
32-
git_override(
32+
single_version_override(
3333
module_name = "rules_jvm_external",
34-
commit = "aca619b117c1fe306ffdd20c5f47cc4dbd5effed",
3534
patch_strip = 1,
3635
patches = ["//java:rules_jvm_external_javadoc.patch"],
37-
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
3836
)
3937

4038
multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
@@ -207,7 +205,7 @@ maven.install(
207205
"io.opentelemetry:opentelemetry-sdk-testing",
208206
"io.opentelemetry:opentelemetry-sdk-trace",
209207
"it.ozimov:embedded-redis:0.7.3",
210-
"net.bytebuddy:byte-buddy:1.17.6",
208+
"net.bytebuddy:byte-buddy:1.17.7",
211209
"org.htmlunit:htmlunit-core-js:4.14.0",
212210
"org.apache.commons:commons-exec:1.5.0",
213211
"org.apache.logging.log4j:log4j-core:2.25.1",

‎common/repositories.bzl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b2/linux-x86_64/en-US/firefox-143.0b2.tar.xz",
54-
sha256 = "70a8af598dedca123b72422811ec04e5a28060778d4a86622f4ecd400f234a78",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b3/linux-x86_64/en-US/firefox-143.0b3.tar.xz",
54+
sha256 = "ea43085f0a47d14a8c088175b489c8af149f59703aec20e6dd2bbf01e36d36fc",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b2/mac/en-US/Firefox%20143.0b2.dmg",
76-
sha256 = "52f9a7a944f857b207bc79f66ae2d600ff8736264d708d6c0fa5138aea664f97",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b3/mac/en-US/Firefox%20143.0b3.dmg",
76+
sha256 = "0e392fc487de20c31c4fe66e25473f91ce001dd6e56528409720f7b9934f34e0",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_linux64.zip",
169-
sha256 = "e092178901c011ccfddc0556193742a01f206d71b5bb1a12cc1ba7a243262fc2",
168+
url = "https://msedgedriver.microsoft.com/139.0.3405.111/edgedriver_linux64.zip",
169+
sha256 = "76f1c0e35120e37848c174eee1368150b7c2461b8e4907c80bcfc2e61b93c471",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_mac64.zip",
186-
sha256 = "98aa637081061ea610c1f70be09fdea6b5f5b3a46c94a87ca291e2285bad1328",
185+
url = "https://msedgedriver.microsoft.com/139.0.3405.111/edgedriver_mac64.zip",
186+
sha256 = "c97588078c6f661dd6c66b858f5e21dc9cbcee40420a2b2e839a05803e0e468f",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])

‎dotnet/src/webdriver/BUILD.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,14 @@ copy_file(
168168
)
169169

170170
copy_file(
171-
name = "assets-nuget-build-netstandard20-targets",
172-
src = "//dotnet/src/webdriver/assets:nuget/build/netstandard2.0/Selenium.WebDriver.targets",
171+
name = "assets-nuget-build-targets",
172+
src = "//dotnet/src/webdriver/assets:nuget/build/Selenium.WebDriver.targets",
173173
out = "Selenium.WebDriver.targets",
174174
)
175175

176176
copy_file(
177-
name = "assets-nuget-buildtransitive-netstandard20-targets",
178-
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
177+
name = "assets-nuget-buildtransitive-targets",
178+
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/Selenium.WebDriver.targets",
179179
out = "transitiveSelenium.WebDriver.targets",
180180
)
181181

@@ -208,8 +208,8 @@ nuget_pack(
208208
"//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
209209
"//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
210210
":assets-nuget-readme": "README.md",
211-
":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.targets",
212-
":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
211+
":assets-nuget-build-targets": "build/Selenium.WebDriver.targets",
212+
":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.targets",
213213
},
214214
id = "Selenium.WebDriver",
215215
libs = {
@@ -234,8 +234,8 @@ nuget_pack(
234234
"//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
235235
"//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
236236
":assets-nuget-readme": "README.md",
237-
":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
238-
":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
237+
":assets-nuget-build-targets": "build/Selenium.WebDriver.StrongNamed.targets",
238+
":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.StrongNamed.targets",
239239
},
240240
id = "Selenium.WebDriver.StrongNamed",
241241
libs = {

‎dotnet/src/webdriver/DriverService.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ protected virtual void OnDriverProcessStarted(DriverProcessStartedEventArgs even
333333
/// </summary>
334334
/// <param name="sender">The sender of the event.</param>
335335
/// <param name="args">The data received event arguments.</param>
336-
/// <param name="isError">A value indicating whether the data received is from the error stream.</param>
337336
protected virtual void OnDriverProcessDataReceived(object sender, DataReceivedEventArgs args)
338337
{
339338
if (string.IsNullOrEmpty(args.Data))

‎dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<file src="lib/net8.0/WebDriver.StrongNamed.pdb" target="lib/net8.0/WebDriver.StrongNamed.pdb" />
4444
<file src="lib/net8.0/WebDriver.StrongNamed.xml" target="lib/net8.0/WebDriver.StrongNamed.xml" />
4545

46-
<file src="build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets" target="build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets"/>
47-
<file src="buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets"/>
46+
<file src="build/Selenium.WebDriver.StrongNamed.targets" target="build/Selenium.WebDriver.StrongNamed.targets"/>
47+
<file src="buildTransitive/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/Selenium.WebDriver.StrongNamed.targets"/>
4848

4949
<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
5050
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />

‎dotnet/src/webdriver/Selenium.WebDriver.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
</ItemGroup>
5858

5959
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
60-
<PackageReference Include="System.Text.Json" Version="8.0.6" />
60+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
6161
</ItemGroup>
6262

6363
<ItemGroup>
64-
<None Include="assets\nuget\build\netstandard2.0\Selenium.WebDriver.targets" Pack="true" PackagePath="build\netstandard2.0\" />
65-
<None Include="assets\nuget\buildTransitive\netstandard2.0\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\" />
64+
<None Include="assets\nuget\build\Selenium.WebDriver.targets" Pack="true" PackagePath="build\" />
65+
<None Include="assets\nuget\buildTransitive\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\" />
6666
</ItemGroup>
6767

6868
<Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="BeforeBuild">

‎dotnet/src/webdriver/Selenium.WebDriver.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<file src="lib/net8.0/WebDriver.pdb" target="lib/net8.0/WebDriver.pdb" />
4444
<file src="lib/net8.0/WebDriver.xml" target="lib/net8.0/WebDriver.xml" />
4545

46-
<file src="build/netstandard2.0/Selenium.WebDriver.targets" target="build/netstandard2.0/Selenium.WebDriver.targets"/>
47-
<file src="buildTransitive/netstandard2.0/Selenium.WebDriver.targets" target="buildTransitive/netstandard2.0/Selenium.WebDriver.targets"/>
46+
<file src="build/Selenium.WebDriver.targets" target="build/Selenium.WebDriver.targets"/>
47+
<file src="buildTransitive/Selenium.WebDriver.targets" target="buildTransitive/Selenium.WebDriver.targets"/>
4848

4949
<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
5050
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />

‎dotnet/src/webdriver/assets/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports_files([
22
"nuget/README.md",
3-
"nuget/build/netstandard2.0/Selenium.WebDriver.targets",
4-
"nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
3+
"nuget/build/Selenium.WebDriver.targets",
4+
"nuget/buildTransitive/Selenium.WebDriver.targets",
55
])

0 commit comments

Comments
 (0)