Skip to content

Commit 4898daa

Browse files
pujaganipujagani
authored
Merge branch 'trunk' into global-proxy-jdk
2 parents 1a30d02 + a98e61f commit 4898daa

32 files changed

Lines changed: 113 additions & 121 deletions

‎Rakefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ $DEBUG = true if ENV['debug'] == 'true'
5151
verbose($DEBUG)
5252

5353
def release_version
54-
'4.14'
54+
'4.15'
5555
end
5656

5757
def version
58-
"#{release_version}.1"
58+
"#{release_version}.0-SNAPSHOT"
5959
end
6060

6161
# The build system used by webdriver is layered on top of rake, and we call it

‎common/mirror/selenium‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,32 @@
2525
{
2626
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-dotnet-4.14.0.zip"
2727
},
28+
{
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-dotnet-4.14.1.zip"
30+
},
2831
{
2932
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-dotnet-strongnamed-4.14.0.zip"
3033
},
34+
{
35+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-dotnet-strongnamed-4.14.1.zip"
36+
},
3137
{
3238
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-java-4.14.0.zip"
3339
},
40+
{
41+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-java-4.14.1.zip"
42+
},
3443
{
3544
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.0.jar"
3645
},
3746
{
3847
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.0.zip"
48+
},
49+
{
50+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.1.jar"
51+
},
52+
{
53+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.1.zip"
3954
}
4055
]
4156
},

‎dotnet/CHANGELOG‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v4.14.1
2+
======
3+
* Fix add CDP files for v118 and remove v115
4+
15
v4.14.0
26
======
37
* Add CDP files for v118 and remove v115

‎dotnet/selenium-dotnet-version.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD FILE SYNTAX: STARLARK
22

3-
SE_VERSION = "4.14.0"
3+
SE_VERSION = "4.14.1"
44
ASSEMBLY_VERSION = "4.0.0.0"
55
SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]
66

‎dotnet/src/webdriver/DevTools/v116/V116Domains.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class V116Domains : DevToolsDomains
2929
private DevToolsSessionDomains domains;
3030

3131
/// <summary>
32-
/// Initializes a new instance of the V115Domains class.
32+
/// Initializes a new instance of the V116Domains class.
3333
/// </summary>
3434
/// <param name="session">The DevToolsSession to use with this set of domains.</param>
3535
public V116Domains(DevToolsSession session)

‎dotnet/src/webdriver/DevTools/v117/V117Domains.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class V117Domains : DevToolsDomains
2929
private DevToolsSessionDomains domains;
3030

3131
/// <summary>
32-
/// Initializes a new instance of the V115Domains class.
32+
/// Initializes a new instance of the V117Domains class.
3333
/// </summary>
3434
/// <param name="session">The DevToolsSession to use with this set of domains.</param>
3535
public V117Domains(DevToolsSession session)

‎dotnet/src/webdriver/DevTools/v118/V118Domains.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class V118Domains : DevToolsDomains
2929
private DevToolsSessionDomains domains;
3030

3131
/// <summary>
32-
/// Initializes a new instance of the V115Domains class.
32+
/// Initializes a new instance of the V118Domains class.
3333
/// </summary>
3434
/// <param name="session">The DevToolsSession to use with this set of domains.</param>
3535
public V118Domains(DevToolsSession session)

‎java/src/org/openqa/selenium/chrome/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@rules_jvm_external//:defs.bzl", "artifact")
21
load("//java:defs.bzl", "java_export")
32
load("//java:version.bzl", "SE_VERSION")
43

@@ -18,6 +17,5 @@ java_export(
1817
"//java/src/org/openqa/selenium/json",
1918
"//java/src/org/openqa/selenium/manager",
2019
"//java/src/org/openqa/selenium/remote",
21-
artifact("com.google.guava:guava"),
2220
],
2321
)

‎java/src/org/openqa/selenium/chrome/ChromeDriver.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
package org.openqa.selenium.chrome;
1919

20-
import com.google.common.collect.ImmutableMap;
2120
import java.util.Map;
21+
import java.util.stream.Collectors;
22+
import java.util.stream.Stream;
2223
import org.openqa.selenium.Beta;
2324
import org.openqa.selenium.Capabilities;
2425
import org.openqa.selenium.WebDriver;
@@ -116,10 +117,10 @@ public ChromeDriverCommandExecutor(DriverService service, ClientConfig clientCon
116117
}
117118

118119
private static Map<String, CommandInfo> getExtraCommands() {
119-
return ImmutableMap.<String, CommandInfo>builder()
120-
.putAll(new AddHasCasting().getAdditionalCommands())
121-
.putAll(new AddHasCdp().getAdditionalCommands())
122-
.build();
120+
return Stream.of(
121+
new AddHasCasting().getAdditionalCommands(), new AddHasCdp().getAdditionalCommands())
122+
.flatMap((m) -> m.entrySet().stream())
123+
.collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
123124
}
124125
}
125126
}

‎java/src/org/openqa/selenium/chromium/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@rules_jvm_external//:defs.bzl", "artifact")
21
load("//java:defs.bzl", "java_export")
32
load("//java:version.bzl", "SE_VERSION")
43

@@ -17,6 +16,5 @@ java_export(
1716
"//java:auto-service",
1817
"//java/src/org/openqa/selenium/json",
1918
"//java/src/org/openqa/selenium/remote",
20-
artifact("com.google.guava:guava"),
2119
],
2220
)

0 commit comments

Comments
 (0)