Skip to content

Commit 0bf92e6

Browse files
authored
Merge branch 'trunk' into java-history-updated-test
2 parents ba04b28 + f5ad7eb commit 0bf92e6

File tree

30 files changed

+331
-161
lines changed

30 files changed

+331
-161
lines changed

.github/workflows/ci-python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
2323
- name: Set up Python 3.9
24-
uses: actions/setup-python@v4
24+
uses: actions/setup-python@v6
2525
with:
2626
python-version: 3.9
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.27.0
30+
pip install tox==4.30.2
3131
- name: Generate docs
3232
run: tox -c py/tox.ini
3333
env:
@@ -41,13 +41,13 @@ jobs:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
4343
- name: Set up Python 3.9
44-
uses: actions/setup-python@v4
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: 3.9
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
50-
pip install tox==4.27.0
50+
pip install tox==4.30.2
5151
- name: Run type checking
5252
run: |
5353
tox -c py/tox.ini || true

.github/workflows/update-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
distribution: 'temurin'
6969
- name: Set up Python 3.9
7070
if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
71-
uses: actions/setup-python@v5
71+
uses: actions/setup-python@v6
7272
with:
7373
python-version: 3.9
7474
- name: Install dependencies

MODULE.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ maven.install(
184184
"com.google.auto.service:auto-service:1.1.1",
185185
"com.google.auto.service:auto-service-annotations:1.1.1",
186186
"com.google.googlejavaformat:google-java-format:1.28.0",
187+
"com.google.protobuf:protobuf-java:3.25.5",
188+
"com.google.protobuf.nano:protobuf-javanano:3.1.0",
187189
"com.graphql-java:graphql-java:24.1",
188190
"dev.failsafe:failsafe:3.3.2",
189191
"io.grpc:grpc-context:1.74.0",
@@ -213,6 +215,7 @@ maven.install(
213215
"org.bouncycastle:bcpkix-jdk18on:1.81",
214216
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
215217
"org.hsqldb:hsqldb:2.7.4",
218+
"org.jboss.marshalling:jboss-marshalling:2.2.3.Final",
216219
"org.jspecify:jspecify:1.0.0",
217220
"org.junit.jupiter:junit-jupiter-api",
218221
"org.junit.jupiter:junit-jupiter-engine",
@@ -232,7 +235,7 @@ maven.install(
232235
],
233236
boms = [
234237
"io.opentelemetry:opentelemetry-bom:1.53.0",
235-
"io.netty:netty-bom:4.1.121.Final",
238+
"io.netty:netty-bom:4.2.4.Final",
236239
"org.junit:junit-bom:5.13.4",
237240
],
238241
excluded_artifacts = [

dotnet/src/webdriver/InvalidSelectorException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class InvalidSelectorException : WebDriverException
3030
/// <summary>
3131
/// Link to the documentation for this error
3232
/// </summary>
33-
private static string supportUrl = baseSupportUrl + "#invalid-selector-exception";
33+
private static string supportUrl = baseSupportUrl + "#invalidselectorexception";
3434

3535
/// <summary>
3636
/// Initializes a new instance of the <see cref="InvalidSelectorException"/> class.

dotnet/src/webdriver/NoSuchElementException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class NoSuchElementException : NotFoundException
3131
/// <summary>
3232
/// Link to the documentation for this error
3333
/// </summary>
34-
private static string supportUrl = baseSupportUrl + "#no-such-element-exception";
34+
private static string supportUrl = baseSupportUrl + "#nosuchelementexception";
3535

3636
/// <summary>
3737
/// Initializes a new instance of the <see cref="NoSuchElementException"/> class.

dotnet/src/webdriver/StaleElementReferenceException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class StaleElementReferenceException : WebDriverException
3030
/// <summary>
3131
/// Link to the documentation for this error
3232
/// </summary>
33-
private static string supportUrl = baseSupportUrl + "#stale-element-reference-exception";
33+
private static string supportUrl = baseSupportUrl + "#staleelementreferenceexception";
3434

3535
/// <summary>
3636
/// Initializes a new instance of the <see cref="StaleElementReferenceException"/> class.

dotnet/test/common/RelativeLocatorTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public void NearLocatorShouldNotFindFarElements()
224224
{
225225
var rect2 = driver.FindElement(RelativeBy.WithLocator(By.Id("rect4")).Near(rect));
226226

227-
}, Throws.TypeOf<NoSuchElementException>().With.Message.EqualTo("Unable to find element; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#no-such-element-exception"));
227+
}, Throws.TypeOf<NoSuchElementException>().With.Message.EqualTo("Unable to find element; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#nosuchelementexception"));
228228
}
229229

230230
//------------------------------------------------------------------

0 commit comments

Comments
 (0)