Skip to content

Commit

Permalink
Merge branch 'trunk' into driver_finder2
Browse files Browse the repository at this point in the history
  • Loading branch information
pujagani committed Feb 2, 2023
2 parents 148cb95 + 2917d05 commit 675372b
Show file tree
Hide file tree
Showing 88 changed files with 5,460 additions and 2,805 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -40,7 +40,7 @@ jobs:
id: check-targets
run: ./scripts/github-actions/check-bazel-targets.sh
env:
COMMIT_RANGE: ${{ github.event.before }}..${{ github.event.after }}
COMMIT_RANGE: ${{ github.event.pull_request.base.sha || github.event.before }}..${{ github.sha }}

dotnet:
name: .NET
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v2
- uses: dessant/lock-threads@v4
with:
process-only: 'issues'
issue-lock-inactive-days: '30'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
- uses: actions/stale@v7
with:
stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
Expand Down
8 changes: 3 additions & 5 deletions README.md
@@ -1,6 +1,6 @@
# Selenium

[![CI](https://github.com/SeleniumHQ/selenium/actions/workflows/ci.yml/badge.svg?branch=trunk)](https://github.com/SeleniumHQ/selenium/actions/workflows/ci.yml)
[![CI](https://github.com/SeleniumHQ/selenium/actions/workflows/ci.yml/badge.svg?branch=trunk&event=schedule)](https://github.com/SeleniumHQ/selenium/actions/workflows/ci.yml)

<a href="https://selenium.dev"><img src="https://selenium.dev/images/selenium_logo_square_green.png" width="180" alt="Selenium"/></a>

Expand Down Expand Up @@ -39,12 +39,10 @@ before submitting your pull requests.
* [Bazelisk](https://github.com/bazelbuild/bazelisk), a Bazel wrapper that automatically downloads
the version of Bazel specified in `.bazelversion` file and transparently passes through all
command-line arguments to the real Bazel binary.
* The latest version of the [Java 11 OpenJDK](https://openjdk.java.net/)
* Java JDK version 11 or greater (e.g., [Java 11 OpenJDK](https://openjdk.java.net/))
* `java` and `jar` on the `$PATH` (make sure you use `java` executable from JDK but not JRE).
* To test this, try running the command `javac`. This command won't exist if you only have the JRE
installed. If you're met with a list of command-line options, you're referencing the JDK properly.
* [Python 3.7+](https://www.python.org/downloads/) and `python` on the `PATH`
* [The tox automation project](http://tox.readthedocs.org/) for Python: `pip install tox`
* macOS users:
* Install the latest version of Xcode including the command-line tools. This command should work `xcode-select --install`
* Apple Silicon Macs should add `build --host_platform=//:rosetta` to their `.bazelrc.local` file. We are working
Expand All @@ -66,7 +64,7 @@ If you plan to compile the
[IE driver](https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver),
you also need:

* [Visual Studio 2008](https://www.visualstudio.com/)
* [Visual Studio 2022](https://www.visualstudio.com/)
* 32 and 64-bit cross compilers

The build will work on any platform, but the tests for IE will be
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Expand Up @@ -51,11 +51,11 @@ $DEBUG = true if ENV['debug'] == 'true'
verbose($DEBUG)

def release_version
'4.7'
'4.8'
end

def version
"#{release_version}.2"
"#{release_version}.0"
end

# The build system used by webdriver is layered on top of rake, and we call it
Expand Down
6 changes: 0 additions & 6 deletions WORKSPACE
Expand Up @@ -229,12 +229,6 @@ rules_closure_toolchains()

http_archive(
name = "rules_pkg",
patch_args = [
"-p1",
],
patches = [
"//py:rules_pkg_tree.patch",
],
sha256 = "eea0f59c28a9241156a47d7a8e32db9122f3d50b505fae0f33de6ce4d9b61834",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.8.0/rules_pkg-0.8.0.tar.gz",
Expand Down
8 changes: 4 additions & 4 deletions cpp/iedriver/IEDriver.rc
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,7,0,0
PRODUCTVERSION 4,7,0,0
FILEVERSION 4,8,0,0
PRODUCTVERSION 4,8,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Software Freedom Conservancy"
VALUE "FileDescription", "Driver library for the IE driver"
VALUE "FileVersion", "4.7.0.0"
VALUE "FileVersion", "4.8.0.0"
VALUE "InternalName", "IEDriver.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "IEDriver.dll"
VALUE "ProductName", "Selenium WebDriver"
VALUE "ProductVersion", "4.7.0.0"
VALUE "ProductVersion", "4.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 4 additions & 0 deletions cpp/iedriverserver/CHANGELOG
Expand Up @@ -9,6 +9,10 @@ available via the project downloads page. Changes in "revision" field indicate
private releases checked into the prebuilts directory of the source tree, but
not made generally available on the downloads page.

v4.8.0.0
========
* Remove unnecessary executable permission bit from several files (#11502)

v4.7.0.0
========
* Ignore Zoom Level for Edge IE Mode (#11055)
Expand Down
8 changes: 4 additions & 4 deletions cpp/iedriverserver/IEDriverServer.rc
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,7,0,0
PRODUCTVERSION 4,7,0,0
FILEVERSION 4,8,0,0
PRODUCTVERSION 4,8,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Software Freedom Conservancy"
VALUE "FileDescription", "Command line server for the IE driver"
VALUE "FileVersion", "4.7.0.0"
VALUE "FileVersion", "4.8.0.0"
VALUE "InternalName", "IEDriverServer.exe"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "IEDriverServer.exe"
VALUE "ProductName", "Selenium WebDriver"
VALUE "ProductVersion", "4.7.0.0"
VALUE "ProductVersion", "4.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
6 changes: 6 additions & 0 deletions dotnet/CHANGELOG
@@ -1,3 +1,9 @@
v4.8.0
======
* Add CDP files for v109 and remove v106
* Add comment with name of large JS executions (#11038)
* Extend invalid selenium manager process exit codes (#11361)

v4.7.0
======
* Adding CDP files for v108 and removing v105
Expand Down
2 changes: 1 addition & 1 deletion dotnet/selenium-dotnet-version.bzl
@@ -1,6 +1,6 @@
# BUILD FILE SYNTAX: STARLARK

SE_VERSION = "4.7.0"
SE_VERSION = "4.8.0"
ASSEMBLY_VERSION = "4.0.0.0"
SUPPORTED_NET_FRAMEWORKS = ["net45", "net46", "net47", "net48"]
SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0", "netstandard2.1", "net5.0", "net6.0"]
Expand Down
28 changes: 26 additions & 2 deletions java/CHANGELOG
@@ -1,16 +1,40 @@
v4.8.0
======
* Supported CDP versions: 85, 107, 108, 109
* Implement Edge and Chrome Driver Services using log level with ChromiumDriverLogLevel enum
* Deprecate Edge Driver Service using log level with String
* Deprecate Chrome Driver Service using log level with ChromeDriverLogLevel enum
* Deprecate setting Chrome Driver Service logging values in Chrome Options
* Close BiDi session on closing the last top-level browsing context
* Add withAllowedListIps() to ChromeDriverService
* Add comment with name of large JS executions (#11038)
* Allow Pointer and Wheel methods to accept Point object (#11477)
* Fix bug where options are not properly merged into capabilities (#11396)
* JDKHttpClient: Fix null pointer bug when responseBody is null (#11450)
* CDP: Ensure child session is created under browser session (#11475)
* Deprecate setHeadless for Chrome and Firefox Options (#11467)
* Grid: Remove translations of non-w3c locators (#11470)
* JDKHttpClient: Handle RQST with no Body [POST/PUT] (#11445)
* Fix bug with decorated webdriver not calling the listeners (#11438)
* BiDi: Add filter parameter to LogInspector methods
* BiDi: Rename 'onConsoleLog' to 'onConsoleEntry'
* CDP: Fix bug with console events returning modified args (#11435)
* Grid: Accommodate ability to specify sub-paths (#11271)
* Grid: fix bug with pulling image using zero content-length (#11342)

v4.7.2
======
* Grid: Support file downloads on the node (#11277)
* Change chromium service names from whitelisted to allowed (#11409)
* Avoid closing CDP connection in browser implementation since that logic now sits in RemoteWebDriver (Fixes #11401)
* Fix bug where failing Selenium Manager method results in wrong error
* Fix bug where failing Selenium Manager method results in wrong error
* Allow changing chromium driver log timestamp formatting
* Allow ignoring chromedriver build checks using service builders
* Add support for appendLog to msedgedriver service
* Fix msedgedriver log level logic
* Allow setting chromedriver log level from system properties
* Fix chromedriver log level logic
* Remove deprecated Firefox capabilities
* Remove deprecated Firefox capabilities
* Removing a few bits more of the magic that moves JWP to W3C
* Removing deprecated SUPPORTS_ALERTS and SUPPORTS_SQL_DATABASE caps
* Removing deprecated OVERLAPPING_CHECK_DISABLED cap
Expand Down
26 changes: 13 additions & 13 deletions java/maven_deps.bzl
Expand Up @@ -2,15 +2,15 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
load("@rules_jvm_external//:specs.bzl", "maven")

def selenium_java_deps():
netty_version = "4.1.86.Final"
opentelemetry_version = "1.21.0"
junit_jupiter_version = "5.9.1"
junit_platform_version = "1.9.1"
netty_version = "4.1.87.Final"
opentelemetry_version = "1.22.0"
junit_jupiter_version = "5.9.2"
junit_platform_version = "1.9.2"

maven_install(
artifacts = [
"com.beust:jcommander:1.82",
"com.github.javaparser:javaparser-core:3.24.9",
"com.github.javaparser:javaparser-core:3.24.10",
maven.artifact(
group = "com.github.spotbugs",
artifact = "spotbugs",
Expand All @@ -19,14 +19,14 @@ def selenium_java_deps():
"org.slf4j:slf4j-api",
],
),
"com.google.code.gson:gson:2.10",
"com.google.code.gson:gson:2.10.1",
"com.google.guava:guava:31.1-jre",
"com.google.auto:auto-common:1.2.1",
"com.google.auto.service:auto-service:1.0.1",
"com.google.auto.service:auto-service-annotations:1.0.1",
"com.graphql-java:graphql-java:20.0",
"com.graphql-java:java-dataloader:3.2.0",
"io.grpc:grpc-context:1.51.1",
"io.grpc:grpc-context:1.52.1",
"io.lettuce:lettuce-core:6.2.2.RELEASE",
"io.netty:netty-buffer:%s" % netty_version,
"io.netty:netty-codec-haproxy:%s" % netty_version,
Expand Down Expand Up @@ -78,11 +78,11 @@ def selenium_java_deps():
"org.junit.platform:junit-platform-engine:%s" % junit_platform_version,
"org.junit.platform:junit-platform-suite-engine:%s" % junit_platform_version,
"org.junit.platform:junit-platform-suite-api:%s" % junit_platform_version,
"net.bytebuddy:byte-buddy:1.12.20",
"net.bytebuddy:byte-buddy:1.12.22",
"dev.failsafe:failsafe:3.3.0",
"net.sourceforge.htmlunit:htmlunit-core-js:2.67.0",
"net.sourceforge.htmlunit:htmlunit-core-js:2.69.0",
"org.apache.commons:commons-exec:1.3",
"org.assertj:assertj-core:3.23.1",
"org.assertj:assertj-core:3.24.2",
maven.artifact(
group = "org.asynchttpclient",
artifact = "async-http-client",
Expand All @@ -95,14 +95,14 @@ def selenium_java_deps():
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
"org.hamcrest:hamcrest:2.2",
"org.hsqldb:hsqldb:2.7.1",
"org.mockito:mockito-core:4.10.0",
"org.mockito:mockito-core:4.11.0",
"org.slf4j:slf4j-api:2.0.6",
"org.slf4j:slf4j-jdk14:2.0.6",
"org.testng:testng:7.7.0",
"org.testng:testng:7.7.1",
"org.zeromq:jeromq:0.5.3",
"xyz.rogfam:littleproxy:2.0.15",
"org.seleniumhq.selenium:htmlunit-driver:4.7.2",
"org.redisson:redisson:3.19.0",
"org.redisson:redisson:3.19.1",
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
],
excluded_artifacts = [
Expand Down

0 comments on commit 675372b

Please sign in to comment.