Skip to content

Commit 654b79c

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into java_cookie
2 parents 3deb058 + a62ef3d commit 654b79c

File tree

498 files changed

+2515
-29170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+2515
-29170
lines changed

‎.github/workflows/update-documentation.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ jobs:
140140
run: |
141141
git config --local user.email "[email protected]"
142142
git config --local user.name "Selenium CI Bot"
143-
- name: Install specific version of DocFX tool
144-
# Pinning to 2.75.3 to avoid breaking changes in newer versions
145-
# See https://github.com/dotnet/docfx/issues/9855
146-
run: dotnet tool install --global --version 2.75.3 docfx
147143
- name: Update Documentation
148144
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
149145
run: ./go dotnet:docs

‎MODULE.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ register_toolchains("@dotnet_toolchains//:all")
9393
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
9494
oci.pull(
9595
name = "java_image_base",
96-
digest = "sha256:161a1d97d592b3f1919801578c3a47c8e932071168a96267698f4b669c24c76d",
96+
digest = "sha256:1df9f3e6a2de0544dd04f1840aa811d334045c9126f9e93d8da45448061ad51e",
9797
image = "gcr.io/distroless/java17",
9898
)
9999
oci.pull(
@@ -224,9 +224,9 @@ maven.install(
224224
"org.zeromq:jeromq:0.6.0",
225225
],
226226
boms = [
227-
"io.opentelemetry:opentelemetry-bom:1.44.1",
228-
"io.netty:netty-bom:4.1.115.Final",
229-
"org.junit:junit-bom:5.11.3",
227+
"io.opentelemetry:opentelemetry-bom:1.46.0",
228+
"io.netty:netty-bom:4.1.117.Final",
229+
"org.junit:junit-bom:5.11.4",
230230
],
231231
excluded_artifacts = [
232232
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2

‎Rakefile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -777,10 +777,9 @@ namespace :dotnet do
777777
task :docs, [:skip_update] do |_task, arguments|
778778
FileUtils.rm_rf('build/docs/api/dotnet/')
779779
begin
780-
# Pinning to 2.75.3 to avoid breaking changes in newer versions
781-
# See https://github.com/dotnet/docfx/issues/9855
780+
# Pinning to 2.78.2 to avoid breaking changes in newer versions
782781
sh 'dotnet tool uninstall --global docfx || true'
783-
sh 'dotnet tool install --global --version 2.75.3 docfx'
782+
sh 'dotnet tool install --global --version 2.78.2 docfx'
784783
# sh 'dotnet tool update -g docfx'
785784
rescue StandardError
786785
puts 'Please ensure that .NET SDK is installed.'
@@ -891,7 +890,7 @@ namespace :java do
891890
task :update do
892891
# Make sure things are in a good state to start with
893892
args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
894-
Bazel.execute('run', args, '@unpinned_maven//:pin')
893+
Bazel.execute('run', args, '@maven//:pin')
895894

896895
file_path = 'MODULE.bazel'
897896
content = File.read(file_path)
@@ -915,7 +914,7 @@ namespace :java do
915914
File.write(file_path, content)
916915

917916
args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
918-
Bazel.execute('run', args, '@unpinned_maven//:pin')
917+
Bazel.execute('run', args, '@maven//:pin')
919918
end
920919

921920
desc 'Update Java changelog'

‎common/src/web/relative_locators.html‎

Lines changed: 72 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
<html>
1+
<html lang="en">
32
<head>
43
<title>Relative Locators</title>
54
<style>
@@ -10,57 +9,101 @@
109
td {
1110
border: solid;
1211
}
13-
.small-rectangle {
12+
#center {
13+
width: 100px;
14+
}
15+
#rectangles {
16+
position: relative;
17+
}
18+
#rectangles div {
19+
position: absolute;
20+
border: 1px solid black;
21+
height: 50px;
22+
width: 50px;
23+
}
24+
#a {
25+
left: 25px;
26+
top: 0;
27+
}
28+
#b {
29+
left: 78px;
30+
top: 30px;
31+
}
32+
#c {
33+
left: 131px;
34+
top: 60px;
35+
}
36+
#d {
37+
left: 0;
38+
top: 53px;
39+
}
40+
#e {
41+
left: 53px;
42+
top: 83px;
43+
}
44+
#f {
45+
left: 106px;
46+
top: 113px;
47+
}
48+
#proximity .small {
1449
border: 1px solid black;
1550
width: 100px;
1651
height: 50px;
1752
margin: 5px 25px;
1853
}
19-
.big-rectangle {
54+
#proximity .big {
2055
border: 1px solid black;
2156
width: 150px;
22-
height: 400px;
57+
height: 400px;
58+
}
59+
#rect3 {
60+
margin: 60px 25px;
2361
}
2462
</style>
2563
</head>
2664
<body>
2765
<h1>Relative Locator Tests</h1>
28-
<p id="above">This text is above.
29-
<p id="mid">This is a paragraph of text in the middle.
30-
<p id="below">This text is below.
31-
66+
<section id="paragraphs">
67+
<p id="above">This text is above.</p>
68+
<p id="mid">This is a paragraph of text in the middle.</p>
69+
<p id="below">This text is below.</p>
70+
</section>
3271

3372
<table>
3473
<tr>
35-
<td id="first">1</td>
36-
<td id="second" style="width: 100px">2</td>
37-
<td id="third">3</td>
74+
<td id="topLeft">1</td>
75+
<td id="top">2</td>
76+
<td id="topRight">3</td>
3877
</tr>
3978
<tr>
40-
<td id="fourth">4</td>
79+
<td id="left">4</td>
4180
<td id="center">5</td>
42-
<td id="sixth">6</td>
81+
<td id="right">6</td>
4382
</tr>
4483
<tr>
45-
<td id="seventh">7</td>
46-
<td id="eighth">8</td>
47-
<td id="ninth">9</td>
84+
<td id="bottomLeft">7</td>
85+
<td id="bottom">8</td>
86+
<td id="bottomRight">9</td>
4887
</tr>
4988
</table>
5089

51-
<div class="small-rectangle" id="rect1">
52-
Rectangle 1
53-
</div>
54-
<div class="big-rectangle" id="rect2">
55-
Rectangle 2, which is near Rectangle 1
56-
</div>
90+
<section id="rectangles">
91+
<div id="a">El-A</div>
92+
<div id="b">El-B</div>
93+
<div id="c">El-C</div>
94+
<div id="d">El-D</div>
95+
<div id="e">El-E</div>
96+
<div id="f">El-F</div>
97+
</section>
5798

58-
<div class="small-rectangle" style="margin:60px 25px" id="rect3">
59-
Rectangle 3
60-
</div>
61-
<div class="big-rectangle" id="rect4">
62-
Rectangle 4, which is not near Rectangle 2 because it is more than 50 px away
63-
</div>
99+
<section id="proximity">
100+
<div class="small" id="rect1">Rectangle 1</div>
101+
<div class="big" id="rect2">Rectangle 2, which is near Rectangle 1</div>
102+
<div class="small" id="rect3">Rectangle 3</div>
103+
<div class="big" id="rect4">
104+
Rectangle 4, which is not near Rectangle 2 because it is more than 50 px away
105+
</div>
106+
</section>
64107

65108
</body>
66109
</html>

‎dotnet/NuGet.Config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎dotnet/docs/docfx.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"dest": "webdriver",
1313
"namespaceLayout": "nested",
14-
"outputFormat": "apiPage"
14+
//"outputFormat": "apiPage" // "apiPage" generation with errors
1515
},
1616
{
1717
"src": [
@@ -24,9 +24,8 @@
2424
],
2525
"dest": "support",
2626
"namespaceLayout": "nested",
27-
"outputFormat": "apiPage"
27+
//"outputFormat": "apiPage" // "apiPage" generation with errors
2828
}
29-
3029
],
3130
"build": {
3231
"content": [

‎dotnet/private/merge_assemblies.bzl‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)