From d5b9382bf3a7858da54b52869b973b73b51db8dd Mon Sep 17 00:00:00 2001 From: titusfortner Date: Mon, 22 Jan 2024 15:50:02 -0600 Subject: [PATCH] update all necessary files prior to a release --- AUTHORS | 6 + Rakefile | 2 +- .../chromium/{v118 => v121}/BUILD.bazel | 0 .../{v118 => v121}/browser_protocol.pdl | 330 ++++++++++++++---- .../chromium/{v118 => v121}/js_protocol.pdl | 24 +- common/repositories.bzl | 16 +- common/selenium_manager.bzl | 12 +- dotnet/selenium-dotnet-version.bzl | 2 +- .../src/webdriver/DevTools/DevToolsDomains.cs | 2 +- .../V118Domains.cs => v121/V121Domains.cs} | 22 +- .../V121JavaScript.cs} | 16 +- .../{v118/V118Log.cs => v121/V121Log.cs} | 14 +- .../V118Network.cs => v121/V121Network.cs} | 24 +- .../V118Target.cs => v121/V121Target.cs} | 14 +- dotnet/src/webdriver/WebDriver.csproj | 2 +- .../StableChannelChromeDriver.cs | 2 +- .../common/DevTools/DevToolsConsoleTest.cs | 2 +- .../test/common/DevTools/DevToolsLogTest.cs | 2 +- .../common/DevTools/DevToolsNetworkTest.cs | 2 +- .../DevTools/DevToolsPerformanceTest.cs | 2 +- .../common/DevTools/DevToolsProfilerTest.cs | 2 +- .../common/DevTools/DevToolsSecurityTest.cs | 2 +- .../common/DevTools/DevToolsTargetTest.cs | 2 +- java/maven_deps.bzl | 54 +-- java/maven_install.json | 290 ++++++++------- .../devtools/{v118 => v121}/BUILD.bazel | 2 +- .../v121CdpInfo.java} | 8 +- .../v121Domains.java} | 26 +- .../v118Events.java => v121/v121Events.java} | 18 +- .../v121Javascript.java} | 14 +- .../{v118/v118Log.java => v121/v121Log.java} | 10 +- .../v121Network.java} | 20 +- .../v118Target.java => v121/v121Target.java} | 24 +- .../org/openqa/selenium/devtools/versions.bzl | 2 +- .../node/selenium-webdriver/BUILD.bazel | 2 +- py/BUILD.bazel | 2 +- rb/Gemfile.lock | 2 +- rb/lib/selenium/devtools/BUILD.bazel | 2 +- rb/lib/selenium/devtools/version.rb | 2 +- 39 files changed, 589 insertions(+), 391 deletions(-) rename common/devtools/chromium/{v118 => v121}/BUILD.bazel (100%) rename common/devtools/chromium/{v118 => v121}/browser_protocol.pdl (97%) rename common/devtools/chromium/{v118 => v121}/js_protocol.pdl (98%) rename dotnet/src/webdriver/DevTools/{v118/V118Domains.cs => v121/V121Domains.cs} (79%) rename dotnet/src/webdriver/DevTools/{v118/V118JavaScript.cs => v121/V121JavaScript.cs} (94%) rename dotnet/src/webdriver/DevTools/{v118/V118Log.cs => v121/V121Log.cs} (89%) rename dotnet/src/webdriver/DevTools/{v118/V118Network.cs => v121/V121Network.cs} (95%) rename dotnet/src/webdriver/DevTools/{v118/V118Target.cs => v121/V121Target.cs} (94%) rename java/src/org/openqa/selenium/devtools/{v118 => v121}/BUILD.bazel (98%) rename java/src/org/openqa/selenium/devtools/{v118/v118CdpInfo.java => v121/v121CdpInfo.java} (86%) rename java/src/org/openqa/selenium/devtools/{v118/v118Domains.java => v121/v121Domains.java} (77%) rename java/src/org/openqa/selenium/devtools/{v118/v118Events.java => v121/v121Events.java} (86%) rename java/src/org/openqa/selenium/devtools/{v118/v118Javascript.java => v121/v121Javascript.java} (85%) rename java/src/org/openqa/selenium/devtools/{v118/v118Log.java => v121/v121Log.java} (89%) rename java/src/org/openqa/selenium/devtools/{v118/v118Network.java => v121/v121Network.java} (92%) rename java/src/org/openqa/selenium/devtools/{v118/v118Target.java => v121/v121Target.java} (83%) diff --git a/AUTHORS b/AUTHORS index bf3f3d9a6ec5e..c854b4ff26193 100644 --- a/AUTHORS +++ b/AUTHORS @@ -87,6 +87,7 @@ Ashley Trinh Aslak Hellesøy asmundak Atsushi Tatsuma +Aurélien Pupier Austin Michael Wilkins <42476341+amwilkins@users.noreply.github.com> BaerMitUmlaut Baran Ozgul @@ -234,6 +235,7 @@ Dvoryadkin Pavel <52860505+DvoryadkinPavel@users.noreply.github.com> Dylan Lacey Dylan Reichstadt Dylan Semler +Earlopain <14981592+Earlopain@users.noreply.github.com> Eberhard Beilharz Edi Weissmann Edirin Atumah @@ -354,6 +356,7 @@ Jake Garelick Jake Klingensmith Jakub Vrána jamadam +James Braza James Cooper James Garbutt <43081j@users.noreply.github.com> James Hilliard @@ -573,6 +576,7 @@ Michał Herda Michele Sama Mickaël Schoentgen Microsoft Provenance Contributions +middlingphys <38708390+middlingphys@users.noreply.github.com> Miguel Carboni Mike Bellew Mike Melia @@ -731,6 +735,7 @@ seanrand57 Sebastian Meyer Sebastian Monte Sebastien Guillemot +seidnerj Selenium CI Bot Sen ZmaKi <90490506+SenZmaKi@users.noreply.github.com> Sergey Chipiga @@ -773,6 +778,7 @@ sugama sunnyyukaige symonk Take +take0x <89313929+take0x@users.noreply.github.com> Takeshi Kishi Takuho NAKANO Takuma Chiba diff --git a/Rakefile b/Rakefile index 078c9c95171a0..037dca8328a08 100644 --- a/Rakefile +++ b/Rakefile @@ -102,7 +102,7 @@ JAVA_RELEASE_TARGETS = %w[ //java/src/org/openqa/selenium/chromium:chromium.publish //java/src/org/openqa/selenium/devtools/v119:v119.publish //java/src/org/openqa/selenium/devtools/v120:v120.publish - //java/src/org/openqa/selenium/devtools/v118:v118.publish + //java/src/org/openqa/selenium/devtools/v121:v121.publish //java/src/org/openqa/selenium/devtools/v85:v85.publish //java/src/org/openqa/selenium/edge:edge.publish //java/src/org/openqa/selenium/firefox:firefox.publish diff --git a/common/devtools/chromium/v118/BUILD.bazel b/common/devtools/chromium/v121/BUILD.bazel similarity index 100% rename from common/devtools/chromium/v118/BUILD.bazel rename to common/devtools/chromium/v121/BUILD.bazel diff --git a/common/devtools/chromium/v118/browser_protocol.pdl b/common/devtools/chromium/v121/browser_protocol.pdl similarity index 97% rename from common/devtools/chromium/v118/browser_protocol.pdl rename to common/devtools/chromium/v121/browser_protocol.pdl index f19168c9ea39f..6c81e477a29fb 100644 --- a/common/devtools/chromium/v118/browser_protocol.pdl +++ b/common/devtools/chromium/v121/browser_protocol.pdl @@ -498,6 +498,7 @@ experimental domain Audits WarnAttributeValueExceedsMaxSize WarnDomainNonASCII WarnThirdPartyPhaseout + WarnCrossSiteRedirectDowngradeChangesInclusion type CookieOperation extends string enum @@ -553,6 +554,7 @@ experimental domain Audits Script ServiceWorker SharedWorker + SpeculationRules Stylesheet Track Video @@ -770,6 +772,15 @@ experimental domain Audits properties array of string trackingSites + # This issue warns about third-party sites that are accessing cookies on the + # current page, and have been permitted due to having a global metadata grant. + # Note that in this context 'site' means eTLD+1. For example, if the URL + # `https://example.test:80/web_page` was accessing cookies, the site reported + # would be `example.test`. + type CookieDeprecationMetadataIssueDetails extends object + properties + array of string allowedSites + type ClientHintIssueReason extends string enum # Items in the accept-ch meta tag allow list must be valid origins. @@ -817,6 +828,8 @@ experimental domain Audits IdTokenHttpNotFound IdTokenNoResponse IdTokenInvalidResponse + IdTokenIdpErrorResponse + IdTokenCrossSiteIdpErrorResponse IdTokenInvalidRequest IdTokenInvalidContentType ErrorIdToken @@ -824,6 +837,7 @@ experimental domain Audits RpPageNotVisible SilentMediationFailure ThirdPartyCookiesBlocked + NotSignedInWithIdp type FederatedAuthUserInfoRequestIssueDetails extends object properties @@ -874,6 +888,24 @@ experimental domain Audits # Contains additional info when the failure was due to a request. optional FailedRequestInfo failedRequestInfo + type PropertyRuleIssueReason extends string + enum + InvalidSyntax + InvalidInitialValue + InvalidInherits + InvalidName + + # This issue warns about errors in property rules that lead to property + # registrations being ignored. + type PropertyRuleIssueDetails extends object + properties + # Source code position of the property rule. + SourceCodeLocation sourceCodeLocation + # Reason why the property rule was discarded. + PropertyRuleIssueReason propertyRuleIssueReason + # The value of the property rule property that failed to parse + optional string propertyValue + # A unique identifier for the type of issue. Each type may use one of the # optional fields in InspectorIssueDetails to convey more specific # information about the kind of issue. @@ -896,8 +928,10 @@ experimental domain Audits ClientHintIssue FederatedAuthRequestIssue BounceTrackingIssue + CookieDeprecationMetadataIssue StylesheetLoadingIssue FederatedAuthUserInfoRequestIssue + PropertyRuleIssue # This struct holds a list of optional fields with additional information # specific to the kind of issue. When adding a new issue code, please also @@ -920,7 +954,9 @@ experimental domain Audits optional ClientHintIssueDetails clientHintIssueDetails optional FederatedAuthRequestIssueDetails federatedAuthRequestIssueDetails optional BounceTrackingIssueDetails bounceTrackingIssueDetails + optional CookieDeprecationMetadataIssueDetails cookieDeprecationMetadataIssueDetails optional StylesheetLoadingIssueDetails stylesheetLoadingIssueDetails + optional PropertyRuleIssueDetails propertyRuleIssueDetails optional FederatedAuthUserInfoRequestIssueDetails federatedAuthUserInfoRequestIssueDetails # A unique id for a DevTools inspector issue. Allows other entities (e.g. @@ -1216,7 +1252,7 @@ domain Browser prompt # Definition of PermissionDescriptor defined in the Permissions API: - # https://w3c.github.io/permissions/#dictdef-permissiondescriptor. + # https://w3c.github.io/permissions/#dom-permissiondescriptor. experimental type PermissionDescriptor extends object properties # Name of permission. @@ -1812,6 +1848,8 @@ experimental domain CSS properties # Font's family name reported by platform. string familyName + # Font's PostScript name reported by platform. + string postScriptName # Indicates if the font was downloaded or resolved locally. boolean isCustomFont # Amount of glyphs that were rendered with this font. @@ -1891,6 +1929,19 @@ experimental domain CSS string syntax + # CSS font-palette-values rule representation. + type CSSFontPaletteValuesRule extends object + properties + # The css style sheet identifier (absent for user agent stylesheet and user-specified + # stylesheet rules) this rule came from. + optional StyleSheetId styleSheetId + # Parent stylesheet's origin. + StyleSheetOrigin origin + # Associated font palette name. + Value fontPaletteName + # Associated style declaration. + CSSStyle style + # CSS property at-rule representation. type CSSPropertyRule extends object properties @@ -2035,6 +2086,8 @@ experimental domain CSS optional array of CSSPropertyRule cssPropertyRules # A list of CSS property registrations matching this node. optional array of CSSPropertyRegistration cssPropertyRegistrations + # A font-palette-values rule matching this node. + optional CSSFontPaletteValuesRule cssFontPaletteValuesRule # Id of the first parent element that does not have display: contents. experimental optional DOM.NodeId parentLayoutNodeId @@ -2095,6 +2148,16 @@ experimental domain CSS string propertyName string value + # Modifies the property rule property name. + command setPropertyRulePropertyName + parameters + StyleSheetId styleSheetId + SourceRange range + string propertyName + returns + # The resulting key text after modification. + Value propertyName + # Modifies the keyframe rule key text. command setKeyframeKey parameters @@ -3238,7 +3301,6 @@ domain DOM # execution will stop on these operations as if there was a regular breakpoint set. domain DOMDebugger depends on DOM - depends on Debugger depends on Runtime # DOM breakpoint type. @@ -3310,7 +3372,8 @@ domain DOMDebugger experimental optional string targetName # Removes breakpoint on particular native event. - experimental command removeInstrumentationBreakpoint + experimental deprecated command removeInstrumentationBreakpoint + redirect EventBreakpoints parameters # Instrumentation name to stop on. string eventName @@ -3345,7 +3408,8 @@ domain DOMDebugger experimental optional string targetName # Sets breakpoint on particular native event. - experimental command setInstrumentationBreakpoint + experimental deprecated command setInstrumentationBreakpoint + redirect EventBreakpoints parameters # Instrumentation name to stop on. string eventName @@ -3356,10 +3420,9 @@ domain DOMDebugger # Resource URL substring. All XHRs having this substring in the URL will get stopped upon. string url -# EventBreakpoints permits setting breakpoints on particular operations and -# events in targets that run JavaScript but do not have a DOM. -# JavaScript execution will stop on these operations as if there was a regular -# breakpoint set. +# EventBreakpoints permits setting JavaScript breakpoints on operations and events +# occurring in native code invoked from JavaScript. Once breakpoint is hit, it is +# reported through Debugger domain, similarly to regular breakpoints being hit. experimental domain EventBreakpoints # Sets breakpoint on particular native event. command setInstrumentationBreakpoint @@ -3373,6 +3436,9 @@ experimental domain EventBreakpoints # Instrumentation name to stop on. string eventName + # Removes all breakpoints + command disable + # This domain facilitates obtaining document snapshots with DOM, layout, and style information. experimental domain DOMSnapshot depends on CSS @@ -3851,6 +3917,13 @@ domain Emulation # A display feature that only splits content will have a 0 mask_length. integer maskLength + type DevicePosture extends object + properties + # Current posture of the device + enum type + continuous + folded + type MediaFeature extends object properties string name @@ -3889,6 +3962,49 @@ domain Emulation optional string bitness optional boolean wow64 + # Used to specify sensor types to emulate. + # See https://w3c.github.io/sensors/#automation for more information. + experimental type SensorType extends string + enum + absolute-orientation + accelerometer + ambient-light + gravity + gyroscope + linear-acceleration + magnetometer + proximity + relative-orientation + + experimental type SensorMetadata extends object + properties + optional boolean available + optional number minimumFrequency + optional number maximumFrequency + + experimental type SensorReadingSingle extends object + properties + number value + + experimental type SensorReadingXYZ extends object + properties + number x + number y + number z + + experimental type SensorReadingQuaternion extends object + properties + number x + number y + number z + number w + + experimental type SensorReading extends object + properties + optional SensorReadingSingle single + optional SensorReadingXYZ xyz + optional SensorReadingQuaternion quaternion + # Tells whether emulation is supported. command canEmulate returns @@ -3965,6 +4081,9 @@ domain Emulation # If set, the display feature of a multi-segment screen. If not set, multi-segment support # is turned-off. experimental optional DisplayFeature displayFeature + # If set, the posture of a foldable device. If not set the posture is set + # to continuous. + experimental optional DevicePosture devicePosture experimental command setScrollbarsHidden parameters @@ -4018,6 +4137,30 @@ domain Emulation # Mock accuracy optional number accuracy + experimental command getOverriddenSensorInformation + parameters + SensorType type + returns + number requestedSamplingFrequency + + # Overrides a platform sensor of a given type. If |enabled| is true, calls to + # Sensor.start() will use a virtual sensor as backend rather than fetching + # data from a real hardware sensor. Otherwise, existing virtual + # sensor-backend Sensor objects will fire an error event and new calls to + # Sensor.start() will attempt to use a real sensor instead. + experimental command setSensorOverrideEnabled + parameters + boolean enabled + SensorType type + optional SensorMetadata metadata + + # Updates the sensor readings reported by a sensor type previously overriden + # by setSensorOverrideEnabled. + experimental command setSensorOverrideReadings + parameters + SensorType type + SensorReading reading + # Overrides the Idle state. experimental command setIdleOverride parameters @@ -4120,7 +4263,7 @@ domain Emulation parameters # User agent to use. string userAgent - # Browser langugage to emulate. + # Browser language to emulate. optional string acceptLanguage # The platform navigator.platform should return. optional string platform @@ -4465,9 +4608,9 @@ domain Input # The normalized tangential pressure, which has a range of [-1,1] (default: 0). experimental optional number tangentialPressure # The plane angle between the Y-Z plane and the plane containing both the stylus axis and the Y axis, in degrees of the range [-90,90], a positive tiltX is to the right (default: 0) - experimental optional integer tiltX + optional number tiltX # The plane angle between the X-Z plane and the plane containing both the stylus axis and the X axis, in degrees of the range [-90,90], a positive tiltY is towards the user (default: 0). - experimental optional integer tiltY + optional number tiltY # The clockwise rotation of a pen stylus around its own major axis, in degrees in the range [0,359] (default: 0). experimental optional integer twist # Identifier used to track touch sources between events, must be unique within an event. @@ -4633,9 +4776,9 @@ domain Input # The normalized tangential pressure, which has a range of [-1,1] (default: 0). experimental optional number tangentialPressure # The plane angle between the Y-Z plane and the plane containing both the stylus axis and the Y axis, in degrees of the range [-90,90], a positive tiltX is to the right (default: 0). - experimental optional integer tiltX + optional number tiltX # The plane angle between the X-Z plane and the plane containing both the stylus axis and the X axis, in degrees of the range [-90,90], a positive tiltY is towards the user (default: 0). - experimental optional integer tiltY + optional number tiltY # The clockwise rotation of a pen stylus around its own major axis, in degrees in the range [0,359] (default: 0). experimental optional integer twist # X delta in CSS pixels for mouse wheel event (default: 0). @@ -5547,6 +5690,10 @@ domain Network # This value is used when the reason is unknown. unspecifiedReason + experimental type ServiceWorkerRouterInfo extends object + properties + integer ruleIdMatched + # HTTP response data. type Response extends object properties @@ -5580,6 +5727,8 @@ domain Network optional boolean fromServiceWorker # Specifies that the request was served from the prefetch cache. optional boolean fromPrefetchCache + # Infomation about how Service Worker Static Router was used. + experimental optional ServiceWorkerRouterInfo serviceWorkerRouterInfo # Total number of bytes received for this request so far. number encodedDataLength # Timing information for the given request. @@ -5695,7 +5844,7 @@ domain Network # Cookie Priority experimental CookiePriority priority # True if cookie is SameParty. - experimental boolean sameParty + experimental deprecated boolean sameParty # Cookie source scheme type. experimental CookieSourceScheme sourceScheme # Cookie source port. Valid values are {-1, [1, 65535]}, -1 indicates an unspecified port. @@ -5726,6 +5875,8 @@ domain Network SameSiteNoneInsecure # The cookie was not stored due to user preferences. UserPreferences + # The cookie was blocked due to third-party cookie phaseout. + ThirdPartyPhaseout # The cookie was blocked by third-party cookie blocking between sites in # the same First-Party Set. ThirdPartyBlockedInFirstPartySet @@ -5771,6 +5922,8 @@ domain Network # character if it appears in the middle of the cookie name, value, an # attribute name, or an attribute value. DisallowedCharacter + # Cookie contains no content or only whitespace. + NoCookieContent # Types of reasons why a cookie may not be sent with a request. experimental type CookieBlockedReason extends string @@ -5797,6 +5950,8 @@ domain Network SameSiteNoneInsecure # The cookie was not sent due to user preferences. UserPreferences + # The cookie was blocked due to third-party cookie phaseout. + ThirdPartyPhaseout # The cookie was blocked by third-party cookie blocking between sites in # the same First-Party Set. ThirdPartyBlockedInFirstPartySet @@ -6291,7 +6446,7 @@ domain Network parameters # User agent to use. string userAgent - # Browser langugage to emulate. + # Browser language to emulate. optional string acceptLanguage # The platform navigator.platform should return. optional string platform @@ -7071,6 +7226,16 @@ experimental domain Overlay # The content box highlight outline color (default: transparent). optional DOM.RGBA outlineColor + # Configuration for Window Controls Overlay + type WindowControlsOverlayConfig extends object + properties + # Whether the title bar CSS should be shown when emulating the Window Controls Overlay. + boolean showCSS + # Seleted platforms to show the overlay. + string selectedPlatform + # The theme color defined in app manifest. + string themeColor + type ContainerQueryHighlightConfig extends object properties # A descriptor for the highlight appearance of container query containers. @@ -7321,6 +7486,12 @@ experimental domain Overlay # An array of node identifiers and descriptors for the highlight appearance. array of IsolatedElementHighlightConfig isolatedElementHighlightConfigs + # Show Window Controls Overlay for PWA + command setShowWindowControlsOverlay + parameters + # Window Controls Overlay data, null means hide Window Controls Overlay + optional WindowControlsOverlayConfig windowControlsOverlayConfig + # Fired when the node should be inspected. This happens after call to `setInspectMode` or when # user manually inspects an element. event inspectNodeRequested @@ -7491,7 +7662,9 @@ domain Page sync-xhr unload usb + usb-unrestricted vertical-scroll + web-printing web-share # Alias for 'window-placement' (crbug.com/1328581). window-management @@ -8000,16 +8173,6 @@ domain Page # as an ad. Only sent if frame is labelled as an ad and id is available. optional AdScriptId adScriptId - # Returns all browser cookies for the page and all of its subframes. Depending - # on the backend support, will return detailed cookie information in the - # `cookies` field. - experimental deprecated command getCookies - # Use 'Network.getCookies' instead - redirect Network - returns - # Array of cookie objects. - array of Network.Cookie cookies - # Returns present frame tree structure. command getFrameTree returns @@ -8152,6 +8315,8 @@ domain Page ReturnAsStream # Whether or not to generate tagged (accessible) PDF. Defaults to embedder choice. experimental optional boolean generateTaggedPDF + # Whether or not to embed the document outline into the PDF. + experimental optional boolean generateDocumentOutline returns # Base64-encoded pdf data. Empty if |returnAsStream| is specified. binary data @@ -8751,6 +8916,17 @@ domain Page PageSupportNeeded Circumstantial + experimental type BackForwardCacheBlockingDetails extends object + properties + # Url of the file where blockage happened. Optional because of tests. + optional string url + # Function name where blockage happened. Optional because of anonymous functions and tests. + optional string function + # Line number in the script (0-based). + integer lineNumber + # Column number in the script (0-based). + integer columnNumber + experimental type BackForwardCacheNotRestoredExplanation extends object properties # Type of the reason @@ -8762,6 +8938,7 @@ domain Page # - EmbedderExtensionSentMessageToCachedFrame: the extension ID. # optional string context + optional array of BackForwardCacheBlockingDetails details experimental type BackForwardCacheNotRestoredExplanationTree extends object properties @@ -9197,6 +9374,7 @@ experimental domain ServiceWorker optional number scriptResponseTime optional array of Target.TargetID controlledClients optional Target.TargetID targetId + optional string routerRules # ServiceWorker error message. type ServiceWorkerErrorMessage extends object @@ -9321,11 +9499,14 @@ experimental domain Storage loaded bid win + additionalBid + additionalBidWin + clear # Ad advertising element inside an interest group. type InterestGroupAd extends object properties - string renderUrl + string renderURL optional string metadata # The full details of an interest group. @@ -9335,10 +9516,10 @@ experimental domain Storage string name Network.TimeSinceEpoch expirationTime string joiningOrigin - optional string biddingUrl - optional string biddingWasmHelperUrl - optional string updateUrl - optional string trustedBiddingSignalsUrl + optional string biddingLogicURL + optional string biddingWasmHelperURL + optional string updateURL + optional string trustedBiddingSignalsURL array of string trustedBiddingSignalsKeys optional string userBiddingSignals array of InterestGroupAd ads @@ -9777,17 +9958,26 @@ experimental domain Storage # duration in seconds array of integer ends + experimental type AttributionReportingTriggerSpec extends object + properties + # number instead of integer because not all uint32 can be represented by + # int + array of number triggerData + AttributionReportingEventReportWindows eventReportWindows + + experimental type AttributionReportingTriggerDataMatching extends string + enum + exact + modulus + experimental type AttributionReportingSourceRegistration extends object properties Network.TimeSinceEpoch time # duration in seconds - optional integer expiry - # eventReportWindow and eventReportWindows are mutually exclusive - # duration in seconds - optional integer eventReportWindow - optional AttributionReportingEventReportWindows eventReportWindows + integer expiry + array of AttributionReportingTriggerSpec triggerSpecs # duration in seconds - optional integer aggregatableReportWindow + integer aggregatableReportWindow AttributionReportingSourceType type string sourceOrigin string reportingOrigin @@ -9797,6 +9987,7 @@ experimental domain Storage array of AttributionReportingFilterDataEntry filterData array of AttributionReportingAggregationKeysEntry aggregationKeys optional UnsignedInt64AsBase10 debugKey + AttributionReportingTriggerDataMatching triggerDataMatching experimental type AttributionReportingSourceRegistrationResult extends string enum @@ -10923,6 +11114,14 @@ experimental domain WebAuthn # Sets whether User Verification succeeds or fails for an authenticator. # Defaults to false. optional boolean isUserVerified + # Credentials created by this authenticator will have the backup + # eligibility (BE) flag set to this value. Defaults to false. + # https://w3c.github.io/webauthn/#sctn-credential-backup + optional boolean defaultBackupEligibility + # Credentials created by this authenticator will have the backup state + # (BS) flag set to this value. Defaults to false. + # https://w3c.github.io/webauthn/#sctn-credential-backup + optional boolean defaultBackupState type Credential extends object properties @@ -11284,7 +11483,6 @@ experimental domain Preload LowEndDevice InvalidSchemeRedirect InvalidSchemeNavigation - InProgressNavigation NavigationRequestBlockedByCsp MainFrameNavigation MojoBinderPolicy @@ -11296,7 +11494,6 @@ experimental domain Preload NavigationBadHttpStatus ClientCertRequested NavigationRequestNetworkError - MaxNumOfRunningPrerendersExceeded CancelAllHostsForTesting DidFailLoad Stop @@ -11308,11 +11505,8 @@ experimental domain Preload MixedContent TriggerBackgrounded MemoryLimitExceeded - # Prerenders can be cancelled when Chrome uses excessive memory. This is - # recorded when it fails to get the memory usage. - FailToGetMemoryUsage DataSaverEnabled - HasEffectiveUrl + TriggerUrlHasEffectiveUrl ActivatedBeforeStarted InactivePageRestriction StartFailed @@ -11341,21 +11535,14 @@ experimental domain Preload MemoryPressureOnTrigger MemoryPressureAfterTriggered PrerenderingDisabledByDevTools - ResourceLoadBlockedByClient SpeculationRuleRemoved ActivatedWithAuxiliaryBrowsingContexts - - # Fired when a prerender attempt is completed. - event prerenderAttemptCompleted - parameters - PreloadingAttemptKey key - # The frame id of the frame initiating prerendering. - Page.FrameId initiatingFrameId - string prerenderingUrl - PrerenderFinalStatus finalStatus - # This is used to give users more information about the name of the API call - # that is incompatible with prerender and has caused the cancellation of the attempt - optional string disallowedApiMethod + MaxNumOfRunningEagerPrerendersExceeded + MaxNumOfRunningNonEagerPrerendersExceeded + MaxNumOfRunningEmbedderPrerendersExceeded + PrerenderingUrlHasEffectiveUrl + RedirectedPrerenderingUrlHasEffectiveUrl + ActivationUrlHasEffectiveUrl # Fired when a preload enabled state is updated. event preloadEnabledStateUpdated @@ -11430,6 +11617,13 @@ experimental domain Preload PrefetchStatus prefetchStatus Network.RequestId requestId + # Information of headers to be displayed when the header mismatch occurred. + type PrerenderMismatchedHeaders extends object + properties + string headerName + optional string initialValue + optional string activationValue + # Fired when a prerender attempt is updated. event prerenderStatusUpdated parameters @@ -11439,6 +11633,7 @@ experimental domain Preload # This is used to give users more information about the name of Mojo interface # that is incompatible with prerender and has caused the cancellation of the attempt. optional string disallowedMojoInterface + optional array of PrerenderMismatchedHeaders mismatchedHeaders # Send a list of sources for all preloading attempts in a document. event preloadingAttemptSourcesUpdated @@ -11455,12 +11650,20 @@ experimental domain FedCm SignIn SignUp - # Whether the dialog shown is an account chooser or an auto re-authentication dialog. + # The types of FedCM dialogs. type DialogType extends string enum AccountChooser AutoReauthn - ConfirmIdpSignin + ConfirmIdpLogin + Error + + # The buttons on the FedCM dialog. + type DialogButton extends string + enum + ConfirmIdpLoginContinue + ErrorGotIt + ErrorMoreDetails # Corresponds to IdentityRequestAccount type Account extends object @@ -11471,7 +11674,7 @@ experimental domain FedCm string givenName string pictureUrl string idpConfigUrl - string idpSigninUrl + string idpLoginUrl LoginState loginState # These two are only set if the loginState is signUp optional string termsOfServiceUrl @@ -11487,6 +11690,12 @@ experimental domain FedCm string title optional string subtitle + # Triggered when a dialog is closed, either by user action, JS abort, + # or a command below. + event dialogClosed + parameters + string dialogId + command enable parameters # Allows callers to disable the promise rejection delay that would @@ -11501,11 +11710,10 @@ experimental domain FedCm string dialogId integer accountIndex - # Only valid if the dialog type is ConfirmIdpSignin. Acts as if the user had - # clicked the continue button. - command confirmIdpSignin + command clickDialogButton parameters string dialogId + DialogButton dialogButton command dismissDialog parameters diff --git a/common/devtools/chromium/v118/js_protocol.pdl b/common/devtools/chromium/v121/js_protocol.pdl similarity index 98% rename from common/devtools/chromium/v118/js_protocol.pdl rename to common/devtools/chromium/v121/js_protocol.pdl index ed6226308c266..4754f17c5b02d 100644 --- a/common/devtools/chromium/v118/js_protocol.pdl +++ b/common/devtools/chromium/v121/js_protocol.pdl @@ -1014,8 +1014,7 @@ domain Runtime # Unique script identifier. type ScriptId extends string - # Represents options for serialization. Overrides `generatePreview`, `returnByValue` and - # `generateWebDriverValue`. + # Represents options for serialization. Overrides `generatePreview` and `returnByValue`. type SerializationOptions extends object properties enum serialization @@ -1027,8 +1026,7 @@ domain Runtime # `returnByValue: true`. Overrides `returnByValue`. json # Only remote object id is put in the result. Same bahaviour as if no - # `serializationOptions`, `generatePreview`, `returnByValue` nor `generateWebDriverValue` - # are provided. + # `serializationOptions`, `generatePreview` nor `returnByValue` are provided. idOnly # Deep serialization depth. Default is full depth. Respected only in `deep` serialization mode. @@ -1066,6 +1064,7 @@ domain Runtime arraybuffer node window + generator optional any value optional string objectId # Set if value reference met more then once during serialization. In such @@ -1125,8 +1124,6 @@ domain Runtime optional UnserializableValue unserializableValue # String representation of the object. optional string description - # Deprecated. Use `deepSerializedValue` instead. WebDriver BiDi representation of the value. - deprecated optional DeepSerializedValue webDriverValue # Deep serialized value. experimental optional DeepSerializedValue deepSerializedValue # Unique object identifier (for non-primitive values). @@ -1442,13 +1439,8 @@ domain Runtime # boundaries). # This is mutually exclusive with `executionContextId`. experimental optional string uniqueContextId - # Deprecated. Use `serializationOptions: {serialization:"deep"}` instead. - # Whether the result should contain `webDriverValue`, serialized according to - # https://w3c.github.io/webdriver-bidi. This is mutually exclusive with `returnByValue`, but - # resulting `objectId` is still provided. - deprecated optional boolean generateWebDriverValue # Specifies the result serialization. If provided, overrides - # `generatePreview`, `returnByValue` and `generateWebDriverValue`. + # `generatePreview` and `returnByValue`. experimental optional SerializationOptions serializationOptions returns @@ -1536,14 +1528,8 @@ domain Runtime # boundaries). # This is mutually exclusive with `contextId`. experimental optional string uniqueContextId - # Deprecated. Use `serializationOptions: {serialization:"deep"}` instead. - # Whether the result should contain `webDriverValue`, serialized - # according to - # https://w3c.github.io/webdriver-bidi. This is mutually exclusive with `returnByValue`, but - # resulting `objectId` is still provided. - deprecated optional boolean generateWebDriverValue # Specifies the result serialization. If provided, overrides - # `generatePreview`, `returnByValue` and `generateWebDriverValue`. + # `generatePreview` and `returnByValue`. experimental optional SerializationOptions serializationOptions returns # Evaluation result. diff --git a/common/repositories.bzl b/common/repositories.bzl index 1f438cfa47108..6d621735106f4 100644 --- a/common/repositories.bzl +++ b/common/repositories.bzl @@ -120,8 +120,8 @@ exports_files( http_archive( name = "linux_chrome", - url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/120.0.6099.109/linux64/chrome-linux64.zip", - sha256 = "bcb22c5242aabf184c6fadd86ee58b3ae35739177edac9de3938ed33791d4ddf", + url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6167.85/linux64/chrome-linux64.zip", + sha256 = "0d4c2fbb4db86121bc72450cb9e8659335a72c1719c348e32331cf512ab1487c", build_file_content = """ filegroup( name = "files", @@ -137,8 +137,8 @@ exports_files( http_archive( name = "mac_chrome", - url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/120.0.6099.109/mac-x64/chrome-mac-x64.zip", - sha256 = "2241f06533bf5710668b006bce4c4e8c2c16a94d629b402ab7889696514eb089", + url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6167.85/mac-x64/chrome-mac-x64.zip", + sha256 = "e150319a0fb5e13adbc703772545c7c9fa20b0474b56667f99f7967f5eefe0b8", strip_prefix = "chrome-mac-x64", patch_cmds = [ "mv 'Google Chrome for Testing.app' Chrome.app", @@ -149,16 +149,16 @@ exports_files( http_archive( name = "linux_chromedriver", - url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/120.0.6099.109/linux64/chromedriver-linux64.zip", - sha256 = "809eb15e15bced4443be914ff3c2a02ca9b0a050e5a8c375563e8bf9b0dd6d27", + url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6167.85/linux64/chromedriver-linux64.zip", + sha256 = "3bc538a59efafcdeeaf5b57b77403ec2522aa9aa33e96c9f6503b87085760883", strip_prefix = "chromedriver-linux64", build_file_content = "exports_files([\"chromedriver\"])", ) http_archive( name = "mac_chromedriver", - url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/120.0.6099.109/mac-x64/chromedriver-mac-x64.zip", - sha256 = "db43a02d6aedc36430c9fa1e86853b5a3987dc8a0e1b8937740c9ae54e5ced07", + url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6167.85/mac-x64/chromedriver-mac-x64.zip", + sha256 = "2033dd8eadc5a4bcba63dc64475e66cdb21a97cc23790cf35ad5ae678b8a9b30", strip_prefix = "chromedriver-mac-x64", build_file_content = "exports_files([\"chromedriver\"])", ) diff --git a/common/selenium_manager.bzl b/common/selenium_manager.bzl index 83152c283941a..62026bb73f577 100644 --- a/common/selenium_manager.bzl +++ b/common/selenium_manager.bzl @@ -6,20 +6,20 @@ def selenium_manager(): http_file( name = "download_sm_linux", executable = True, - sha256 = "cb0853d449c86bbb0ef5b293bb0d22398ca379549f508c09826398fa06269af3", - url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-60aa87f/selenium-manager-linux", + sha256 = "b417e4faad5ab781102f6ba83f0bfc39b60343fbc43455a2732cab82420dcd0e", + url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-03637c4/selenium-manager-linux", ) http_file( name = "download_sm_macos", executable = True, - sha256 = "db4f28bdf5f84f841e1e400f019bef396b3b73bddf01a7fc4b9b946ee566654a", - url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-60aa87f/selenium-manager-macos", + sha256 = "f0990a97a24db5b0aa9d2fcbc7b69eaad11e96a4f3a75887f667b874bdc5e713", + url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-03637c4/selenium-manager-macos", ) http_file( name = "download_sm_windows", executable = True, - sha256 = "f59390cc8adb76c20fe7701c4367d0a35a4dcd097974a2fa7bff6defab4c7521", - url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-60aa87f/selenium-manager-windows.exe", + sha256 = "cb6e0b5ca072038e7626f77263c4b443b1f3e6c550cf3ebf09bf7d2c237a7389", + url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-03637c4/selenium-manager-windows.exe", ) diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl index 1f599887fa972..c5e769f84b46a 100644 --- a/dotnet/selenium-dotnet-version.bzl +++ b/dotnet/selenium-dotnet-version.bzl @@ -8,7 +8,7 @@ SUPPORTED_DEVTOOLS_VERSIONS = [ "v85", "v119", "v120", - "v118", + "v121", ] ASSEMBLY_COMPANY = "Selenium Committers" diff --git a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs index bae33a070b225..eabbed72fe077 100644 --- a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs +++ b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs @@ -37,7 +37,7 @@ public abstract class DevToolsDomains // added to this dictionary. private static readonly Dictionary SupportedDevToolsVersions = new Dictionary() { - { 118, typeof(V118.V118Domains) }, + { 121, typeof(V121.V121Domains) }, { 120, typeof(V120.V120Domains) }, { 119, typeof(V119.V119Domains) }, { 85, typeof(V85.V85Domains) } diff --git a/dotnet/src/webdriver/DevTools/v118/V118Domains.cs b/dotnet/src/webdriver/DevTools/v121/V121Domains.cs similarity index 79% rename from dotnet/src/webdriver/DevTools/v118/V118Domains.cs rename to dotnet/src/webdriver/DevTools/v121/V121Domains.cs index d94562ebda549..a9d974c3f2896 100644 --- a/dotnet/src/webdriver/DevTools/v118/V118Domains.cs +++ b/dotnet/src/webdriver/DevTools/v121/V121Domains.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -19,20 +19,20 @@ using System.Collections.Generic; using System.Text; -namespace OpenQA.Selenium.DevTools.V118 +namespace OpenQA.Selenium.DevTools.V121 { /// - /// Class containing the domain implementation for version 118 of the DevTools Protocol. + /// Class containing the domain implementation for version 121 of the DevTools Protocol. /// - public class V118Domains : DevToolsDomains + public class V121Domains : DevToolsDomains { private DevToolsSessionDomains domains; /// - /// Initializes a new instance of the V118Domains class. + /// Initializes a new instance of the V121Domains class. /// /// The DevToolsSession to use with this set of domains. - public V118Domains(DevToolsSession session) + public V121Domains(DevToolsSession session) { this.domains = new DevToolsSessionDomains(session); } @@ -40,7 +40,7 @@ public V118Domains(DevToolsSession session) /// /// Gets the DevTools Protocol version for which this class is valid. /// - public static int DevToolsVersion => 118; + public static int DevToolsVersion => 121; /// /// Gets the version-specific domains for the DevTools session. This value must be cast to a version specific type to be at all useful. @@ -50,21 +50,21 @@ public V118Domains(DevToolsSession session) /// /// Gets the object used for manipulating network information in the browser. /// - public override DevTools.Network Network => new V118Network(domains.Network, domains.Fetch); + public override DevTools.Network Network => new V121Network(domains.Network, domains.Fetch); /// /// Gets the object used for manipulating the browser's JavaScript execution. /// - public override JavaScript JavaScript => new V118JavaScript(domains.Runtime, domains.Page); + public override JavaScript JavaScript => new V121JavaScript(domains.Runtime, domains.Page); /// /// Gets the object used for manipulating DevTools Protocol targets. /// - public override DevTools.Target Target => new V118Target(domains.Target); + public override DevTools.Target Target => new V121Target(domains.Target); /// /// Gets the object used for manipulating the browser's logs. /// - public override DevTools.Log Log => new V118Log(domains.Log); + public override DevTools.Log Log => new V121Log(domains.Log); } } diff --git a/dotnet/src/webdriver/DevTools/v118/V118JavaScript.cs b/dotnet/src/webdriver/DevTools/v121/V121JavaScript.cs similarity index 94% rename from dotnet/src/webdriver/DevTools/v118/V118JavaScript.cs rename to dotnet/src/webdriver/DevTools/v121/V121JavaScript.cs index 95d3ef164ec83..720fb1063ee62 100644 --- a/dotnet/src/webdriver/DevTools/v118/V118JavaScript.cs +++ b/dotnet/src/webdriver/DevTools/v121/V121JavaScript.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -18,25 +18,25 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V118.Page; -using OpenQA.Selenium.DevTools.V118.Runtime; +using OpenQA.Selenium.DevTools.V121.Page; +using OpenQA.Selenium.DevTools.V121.Runtime; -namespace OpenQA.Selenium.DevTools.V118 +namespace OpenQA.Selenium.DevTools.V121 { /// - /// Class containing the JavaScript implementation for version 118 of the DevTools Protocol. + /// Class containing the JavaScript implementation for version 121 of the DevTools Protocol. /// - public class V118JavaScript : JavaScript + public class V121JavaScript : JavaScript { private RuntimeAdapter runtime; private PageAdapter page; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The DevTools Protocol adapter for the Runtime domain. /// The DevTools Protocol adapter for the Page domain. - public V118JavaScript(RuntimeAdapter runtime, PageAdapter page) + public V121JavaScript(RuntimeAdapter runtime, PageAdapter page) { this.runtime = runtime; this.page = page; diff --git a/dotnet/src/webdriver/DevTools/v118/V118Log.cs b/dotnet/src/webdriver/DevTools/v121/V121Log.cs similarity index 89% rename from dotnet/src/webdriver/DevTools/v118/V118Log.cs rename to dotnet/src/webdriver/DevTools/v121/V121Log.cs index 099da81dbefc8..e3cde87f6cd8f 100644 --- a/dotnet/src/webdriver/DevTools/v118/V118Log.cs +++ b/dotnet/src/webdriver/DevTools/v121/V121Log.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -20,22 +20,22 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V118.Log; +using OpenQA.Selenium.DevTools.V121.Log; -namespace OpenQA.Selenium.DevTools.V118 +namespace OpenQA.Selenium.DevTools.V121 { /// - /// Class containing the browser's log as referenced by version 118 of the DevTools Protocol. + /// Class containing the browser's log as referenced by version 121 of the DevTools Protocol. /// - public class V118Log : DevTools.Log + public class V121Log : DevTools.Log { private LogAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Log domain. - public V118Log(LogAdapter adapter) + public V121Log(LogAdapter adapter) { this.adapter = adapter; this.adapter.EntryAdded += OnAdapterEntryAdded; diff --git a/dotnet/src/webdriver/DevTools/v118/V118Network.cs b/dotnet/src/webdriver/DevTools/v121/V121Network.cs similarity index 95% rename from dotnet/src/webdriver/DevTools/v118/V118Network.cs rename to dotnet/src/webdriver/DevTools/v121/V121Network.cs index 38d414ae202de..0b7005a1cc0e6 100644 --- a/dotnet/src/webdriver/DevTools/v118/V118Network.cs +++ b/dotnet/src/webdriver/DevTools/v121/V121Network.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -20,25 +20,25 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V118.Fetch; -using OpenQA.Selenium.DevTools.V118.Network; +using OpenQA.Selenium.DevTools.V121.Fetch; +using OpenQA.Selenium.DevTools.V121.Network; -namespace OpenQA.Selenium.DevTools.V118 +namespace OpenQA.Selenium.DevTools.V121 { /// - /// Class providing functionality for manipulating network calls using version 118 of the DevTools Protocol + /// Class providing functionality for manipulating network calls using version 121 of the DevTools Protocol /// - public class V118Network : DevTools.Network + public class V121Network : DevTools.Network { private FetchAdapter fetch; private NetworkAdapter network; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Network domain. /// The adapter for the Fetch domain. - public V118Network(NetworkAdapter network, FetchAdapter fetch) + public V121Network(NetworkAdapter network, FetchAdapter fetch) { this.network = network; this.fetch = fetch; @@ -216,9 +216,9 @@ public override async Task ContinueWithAuth(string requestId, string userName, s await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new V118.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new V121.Fetch.AuthChallengeResponse() { - Response = V118.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, + Response = V121.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, Username = userName, Password = password } @@ -235,9 +235,9 @@ public override async Task CancelAuth(string requestId) await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new OpenQA.Selenium.DevTools.V118.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new OpenQA.Selenium.DevTools.V121.Fetch.AuthChallengeResponse() { - Response = V118.Fetch.AuthChallengeResponseResponseValues.CancelAuth + Response = V121.Fetch.AuthChallengeResponseResponseValues.CancelAuth } }).ConfigureAwait(false); } diff --git a/dotnet/src/webdriver/DevTools/v118/V118Target.cs b/dotnet/src/webdriver/DevTools/v121/V121Target.cs similarity index 94% rename from dotnet/src/webdriver/DevTools/v118/V118Target.cs rename to dotnet/src/webdriver/DevTools/v121/V121Target.cs index 3f4a4f620ec95..4afeb6abbe357 100644 --- a/dotnet/src/webdriver/DevTools/v118/V118Target.cs +++ b/dotnet/src/webdriver/DevTools/v121/V121Target.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -21,22 +21,22 @@ using System.Collections.ObjectModel; using System.Text; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V118.Target; +using OpenQA.Selenium.DevTools.V121.Target; -namespace OpenQA.Selenium.DevTools.V118 +namespace OpenQA.Selenium.DevTools.V121 { /// - /// Class providing functionality for manipulating targets for version 118 of the DevTools Protocol + /// Class providing functionality for manipulating targets for version 121 of the DevTools Protocol /// - public class V118Target : DevTools.Target + public class V121Target : DevTools.Target { private TargetAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Target domain. - public V118Target(TargetAdapter adapter) + public V121Target(TargetAdapter adapter) { this.adapter = adapter; adapter.DetachedFromTarget += OnDetachedFromTarget; diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj index 46fe8e0703d8a..536a48df73f99 100644 --- a/dotnet/src/webdriver/WebDriver.csproj +++ b/dotnet/src/webdriver/WebDriver.csproj @@ -106,7 +106,7 @@ - + diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs index 714acee8974ba..62330cdf37497 100644 --- a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs +++ b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs @@ -20,7 +20,7 @@ public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions opti public static ChromeOptions DefaultOptions { - get { return new ChromeOptions() { BrowserVersion = "120" }; } + get { return new ChromeOptions() { BrowserVersion = "121" }; } } } } diff --git a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs index c04c1f0802211..aae152144be6d 100644 --- a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs +++ b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsConsoleTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsLogTest.cs b/dotnet/test/common/DevTools/DevToolsLogTest.cs index d2a09f91842a1..75de6361ade3e 100644 --- a/dotnet/test/common/DevTools/DevToolsLogTest.cs +++ b/dotnet/test/common/DevTools/DevToolsLogTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsLogTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs index 3d49113e14d58..080a87a8bc5cd 100644 --- a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs +++ b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsNetworkTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs index 341b74e2105d4..c1a733fa43cea 100644 --- a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs +++ b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs @@ -3,7 +3,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsPerformanceTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs index 636e342e3e47c..cf9c35fc1fdd5 100644 --- a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs +++ b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs @@ -5,7 +5,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsProfilerTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs index f77fb33589405..c7da098bcd96e 100644 --- a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs +++ b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsSecurityTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsTargetTest.cs b/dotnet/test/common/DevTools/DevToolsTargetTest.cs index 00a7909573a40..ad0d7e0a9584c 100644 --- a/dotnet/test/common/DevTools/DevToolsTargetTest.cs +++ b/dotnet/test/common/DevTools/DevToolsTargetTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V120; + using CurrentCdpVersion = V121; [TestFixture] public class DevToolsTargetTest : DevToolsTestFixture diff --git a/java/maven_deps.bzl b/java/maven_deps.bzl index c51cd79c3ed02..60b6ef0cfbc85 100644 --- a/java/maven_deps.bzl +++ b/java/maven_deps.bzl @@ -4,7 +4,7 @@ def selenium_java_deps(): maven_install( artifacts = [ "com.beust:jcommander:1.82", - "com.github.javaparser:javaparser-core:3.25.7", + "com.github.javaparser:javaparser-core:3.25.8", "com.github.spotbugs:spotbugs:4.8.3", "com.github.stephenc.jcip:jcip-annotations:1.0-1", "com.google.code.gson:gson:2.10.1", @@ -12,36 +12,36 @@ def selenium_java_deps(): "com.google.auto:auto-common:1.2.2", "com.google.auto.service:auto-service:1.1.1", "com.google.auto.service:auto-service-annotations:1.1.1", - "com.google.googlejavaformat:google-java-format:jar:1.19.1", + "com.google.googlejavaformat:google-java-format:jar:1.19.2", "com.graphql-java:graphql-java:20.2", "com.graphql-java:java-dataloader:3.2.0", "dev.failsafe:failsafe:3.3.2", - "io.grpc:grpc-context:1.60.1", - "io.lettuce:lettuce-core:6.3.0.RELEASE", - "io.netty:netty-buffer:4.1.104.Final", - "io.netty:netty-codec-http:4.1.104.Final", - "io.netty:netty-codec-http2:4.1.104.Final", - "io.netty:netty-common:4.1.104.Final", - "io.netty:netty-handler:4.1.104.Final", - "io.netty:netty-handler-proxy:4.1.104.Final", - "io.netty:netty-transport:4.1.104.Final", - "io.opentelemetry:opentelemetry-api:1.33.0", - "io.opentelemetry:opentelemetry-context:1.33.0", - "io.opentelemetry:opentelemetry-exporter-logging:1.33.0", - "io.opentelemetry:opentelemetry-sdk:1.33.0", - "io.opentelemetry:opentelemetry-sdk-common:1.33.0", - "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.33.0", - "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.33.0", - "io.opentelemetry:opentelemetry-sdk-testing:1.33.0", - "io.opentelemetry:opentelemetry-sdk-trace:1.33.0", + "io.grpc:grpc-context:1.61.0", + "io.lettuce:lettuce-core:6.3.1.RELEASE", + "io.netty:netty-buffer:4.1.106.Final", + "io.netty:netty-codec-http:4.1.106.Final", + "io.netty:netty-codec-http2:4.1.106.Final", + "io.netty:netty-common:4.1.106.Final", + "io.netty:netty-handler:4.1.106.Final", + "io.netty:netty-handler-proxy:4.1.106.Final", + "io.netty:netty-transport:4.1.106.Final", + "io.opentelemetry:opentelemetry-api:1.34.1", + "io.opentelemetry:opentelemetry-context:1.34.1", + "io.opentelemetry:opentelemetry-exporter-logging:1.34.1", + "io.opentelemetry:opentelemetry-sdk:1.34.1", + "io.opentelemetry:opentelemetry-sdk-common:1.34.1", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.34.1", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.34.1", + "io.opentelemetry:opentelemetry-sdk-testing:1.34.1", + "io.opentelemetry:opentelemetry-sdk-trace:1.34.1", "io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha", "io.ous:jtoml:2.0.0", "it.ozimov:embedded-redis:0.7.3", "net.bytebuddy:byte-buddy:1.14.11", - "org.htmlunit:htmlunit-core-js:3.9.0", + "org.htmlunit:htmlunit-core-js:3.10.0", "org.apache.commons:commons-exec:1.3", - "org.apache.logging.log4j:log4j-core:2.22.0", - "org.assertj:assertj-core:3.24.2", + "org.apache.logging.log4j:log4j-core:2.22.1", + "org.assertj:assertj-core:3.25.1", "org.bouncycastle:bcpkix-jdk18on:1.77", "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5", "org.hsqldb:hsqldb:2.7.2", @@ -52,11 +52,11 @@ def selenium_java_deps(): "org.junit.platform:junit-platform-reporting:1.10.1", "org.junit.platform:junit-platform-commons:1.10.1", "org.junit.platform:junit-platform-engine:1.10.1", - "org.mockito:mockito-core:5.8.0", + "org.mockito:mockito-core:5.9.0", "org.mockito:mockito-inline:5.2.0", - "org.redisson:redisson:3.25.2", - "org.slf4j:slf4j-api:2.0.9", - "org.slf4j:slf4j-jdk14:2.0.9", + "org.redisson:redisson:3.26.0", + "org.slf4j:slf4j-api:2.0.11", + "org.slf4j:slf4j-jdk14:2.0.11", "org.zeromq:jeromq:0.5.4", ], excluded_artifacts = [ diff --git a/java/maven_install.json b/java/maven_install.json index d0c045f5821e1..5be19360e420c 100644 --- a/java/maven_install.json +++ b/java/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1132813251, - "__RESOLVED_ARTIFACTS_HASH": 1655089516, + "__INPUT_ARTIFACTS_HASH": 892178197, + "__RESOLVED_ARTIFACTS_HASH": -1231266529, "artifacts": { "com.beust:jcommander": { "shasums": { @@ -12,10 +12,10 @@ }, "com.esotericsoftware:kryo": { "shasums": { - "jar": "4b902a21d99f7b4c32e6f7400e91f9284fd184db881bb9e18328e14d8127f7f9", - "sources": "a7fe17d9e5c3f18ba2070b1356aeafc3f1626e8ebb6161a70d84c2f17adcd072" + "jar": "ead0f39530d6f30d27791eeb81621f3d7445331a06c32b3302e0ebe9e04b3a5d", + "sources": "fe808d5e9370797ebeddd87f1aefb84c15281a18148388645c79c2382acc1e5f" }, - "version": "5.5.0" + "version": "5.6.0" }, "com.esotericsoftware:minlog": { "shasums": { @@ -33,38 +33,38 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "shasums": { - "jar": "aae865c3d88256d61b11523cb1e88bd48d5b9ad5855fa1fc859504fd2204708a", - "sources": "9b3f2b6791a3e775cec9b9be575add9406b8423d8b49662b78c1017f22952528" + "jar": "a4730771e6a495dd3793a42cdb8ce6bddb96c77e15f40c98fd8d9a7ae09e7286", + "sources": "cebdb714198d5b3a152efb9e940dc9eb26cb37aa688ce34431b99afb790f6be3" }, - "version": "2.15.3" + "version": "2.16.1" }, "com.fasterxml.jackson.core:jackson-core": { "shasums": { - "jar": "51fab7aad51ed588482edc507fd542747936c5094d1ab76ed21ddb63b96b610d", - "sources": "31cb17527c55716c59fb0a10736b1b29306b4db0de8476e1ab6e54f85fe4ff55" + "jar": "f5f8ef90609e64fec82eb908e497dc7d81b2eb983fe509b870292a193cde4dfb", + "sources": "1bd334b0de7d02d7f8a6591f775a28126b1cdce9cd9ae6dc260482b7bdd9a04c" }, - "version": "2.15.3" + "version": "2.16.1" }, "com.fasterxml.jackson.core:jackson-databind": { "shasums": { - "jar": "c3c53333a2172a80678bda1803e39cff45bec6ae3e9c7d4f44a81ec4e2ab18dc", - "sources": "d692cdf070e03c11e95306da08ecdf312aac559f158019a5bfcdc6e0798d5456" + "jar": "baf8a8ebee8f45ef68cdd5e2dd3923b3e296c0937b96ec0b4806aa3a31bccd1d", + "sources": "91390204018cbeb9c5ed6e60c2624b63c8221082af9b0e94ce7f2d926ec48e2c" }, - "version": "2.15.3" + "version": "2.16.1" }, "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { "shasums": { - "jar": "2dd70a080e8542dc5ee727387abed963fc24122cd784ab38355f87d0e08d9772", - "sources": "25889879ca0a0612fa94711cca7e49137069984c979dab51dda9e736d1a1c881" + "jar": "fd67e0fafe368ad3dfc1b545eb8fe084a5c64628fb71ef70bd94a4dab27aefff", + "sources": "fee5fa554e06bf36f697e32f98d255528b54fc8901bcf59ad5ce41c4e35784b5" }, - "version": "2.15.3" + "version": "2.16.1" }, "com.github.javaparser:javaparser-core": { "shasums": { - "jar": "159f5e5024d0548ec63cf9d2488ad410d646164581570235ed04eef69242d2d6", - "sources": "83383028a7f0fa648f26e74977d3ebbf86f98f6fb7ba58d9605d8c2832485575" + "jar": "3ac2c42a234c1ee43a55bc22911934ddd537bba78931265d072ed34c22b06d96", + "sources": "b6eb63a106b16e0c2953b985d15c3126fa772e550d9f9be60c0cdd2d4d29880d" }, - "version": "3.25.7" + "version": "3.25.8" }, "com.github.spotbugs:spotbugs": { "shasums": { @@ -131,10 +131,10 @@ }, "com.google.googlejavaformat:google-java-format": { "shasums": { - "jar": "ff15abac529f6ecb97878aa2ae271a4d3b15f526c1f823757dd8781c0b11c73b", - "sources": "14970cf44a06ae9e7e160ed9888c7d8ffa229dbdbdc57ad4725d5ceaaa9a7273" + "jar": "bac84458eb12499585f2fabb1ac13bbe5b455c120bf3d19db21597814a27c863", + "sources": "003cadae4d160a84e9ce62ffb375e5e13b4cd129c4581a93739f0209d289d80b" }, - "version": "1.19.1" + "version": "1.19.2" }, "com.google.guava:failureaccess": { "shasums": { @@ -215,115 +215,115 @@ }, "io.grpc:grpc-api": { "shasums": { - "jar": "bdcefde43d7c542e748adb7b2bccc46db16313ba86ab46f8ba3b54677c7c5883", - "sources": "23d0d4bb5eed8cf0b5732ab96c815028071e2b3537bd39f5dfe0c8f16731e74c" + "jar": "30f314fd84e03053d07b4ddf84bcc5889cf30aac219bb1d08d8fc2f8c54f4255", + "sources": "857004e81fc269c60ccbe810fb9be529a957677785c676520bf1e1b42e28734a" }, - "version": "1.60.1" + "version": "1.61.0" }, "io.grpc:grpc-context": { "shasums": { - "jar": "4ab6efb9cbadc88f8dc723ada3a61785da367697373d4432aef5222312aa70f6", - "sources": "90655e7ff0d7ee867fbdf7c6ac6db13ef9b339f4e8e3af15665f5a98101f9674" + "jar": "21f4ac4c5e9517a2d0282438fd83f0659e8cac226bf05e0860f84c899bceab61", + "sources": "8bede6b622dd0d7dd7c5a69e97e01c54eb0e1a4e2cdc2a67f3bf0b2e275c6fa4" }, - "version": "1.60.1" + "version": "1.61.0" }, "io.lettuce:lettuce-core": { "shasums": { - "jar": "9dfcc129e672004933675fa1595432989207bfe71a06813c9eb35daa76e9b380", - "sources": "4bc510812fe188972129cfe37ddbb3099f242766411cdc15a95c6dd0f42574ed" + "jar": "bc74138f8be5a2eac27a7a91fa076d012fc882a363d5b171e7f9d7fd481ae935", + "sources": "021f28d8ac9b1d125ce0407316440c032245a73b7bf0166489eb28d09c78b490" }, - "version": "6.3.0.RELEASE" + "version": "6.3.1.RELEASE" }, "io.netty:netty-buffer": { "shasums": { - "jar": "1e5361d1371ae75836717a22d0b0fba8393ef3ddb345abd7581c97c37aeac568", - "sources": "52313acd4c59490aa920f60e6d4a1dcd011938cb83d7960b9b65492a45b3566c" + "jar": "d5067bdbe476d63cb43293822832a749a7c38a38c1c516107c73d257c39bed21", + "sources": "3f372883eb88f27777870a55e02964fb84e3c474693e9c2213c04b6a246386ec" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-codec": { "shasums": { - "jar": "36d9840e76de66fbf60da20d740b3974a3545b0a4d68a16a7c19ae998f541098", - "sources": "01a138c7598cde0a8c10212eb07e502fb07694da0622d2b6a65d8c25a4681a86" + "jar": "93863dfd690f7ace7c26e4c808fdc24780adad465b3cdcb7ce3fc73c422df76f", + "sources": "7a2fa3c3645023d7ff66a5784e18ca18c0019a18fa9b7eb77fcb8e97e358af4e" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-codec-dns": { "shasums": { - "jar": "e85d0929d017f0f625495e5ce1c033b1ba6f30d53b1fb5f403cac0a7e996babe", - "sources": "a1e04a990582dc3a2a264c65b3ebe8c85a4b550ee80eec1dca3d149506557089" + "jar": "d174befa24f1259366d234a1f814260534a6a8ec57079bfa444db183ca83954b", + "sources": "797e1f5e56634384b742d9dfaf17061a417d14c17e82c33ddce04f112f79397e" }, - "version": "4.1.101.Final" + "version": "4.1.104.Final" }, "io.netty:netty-codec-http": { "shasums": { - "jar": "8e635413e623f3f1b337524931be620feb0369def735ede338f67db55cf8fc9b", - "sources": "46c2d7925f206182690dbf65c2ce3e3b5b1c3d238d74a07e6f38fc766667a854" + "jar": "ba177a03adc587fa63e96f1dbae9c46ff25f59397ea34d960b45e05d0296026e", + "sources": "0e6837b9333587132112dcaadd57944ce857629f3c3de83b1892be76290e0765" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-codec-http2": { "shasums": { - "jar": "fc03e6a2cc2d59f80fb1ec2957621e2630a952db36e069ccbbd72e0662796881", - "sources": "0d4ad8ee856810d067cab5bdb29cfe8bbfaeb70350ce5215694e1cff850ba679" + "jar": "c2b821d57a733cd671ea2ab0642002b17e0a2b89004ca026c6eae8f5381cf81e", + "sources": "c777aeac2033d0ab523c59a2c4415d29bc008d7a1521b12ab0954dc53fbadcea" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-codec-socks": { "shasums": { - "jar": "c8fac27f4d78fb3abd627907a5412fbe85fecc0671fa36f9ef7d0d26670caf05", - "sources": "116e937045816dc6ec366b3a0d056d9889480262d74cabab3fe81cf58442ae18" + "jar": "9811f9bf20a6128518d92182527867e40a0dbc41ea5380d61e284ff9f4f488a3", + "sources": "a9087a65786fec2ed3acc2be70905718ece9fbc67967e9e543b88fd1a351ef5a" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-common": { "shasums": { - "jar": "b98b35afc0c704039dc636c5531583e3100c65e1c6bbf1b109761324bbedb06a", - "sources": "fa2558b8e4b6cdda2e68cad36599c2002bd378dd84a8ec10f216adafbcbbb7e4" + "jar": "5ffbe01bd845617a916de3613010d5fda57c5eb694147d38d04f791e9834d5c3", + "sources": "f4ab6ad6fbf4fde6614bbbde3dc2d9193759404e20b8dc13c366c8e34b91b64a" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-handler": { "shasums": { - "jar": "4c30c26d158fbf6dcebb54f8524e902a0df4fc6157f597af96a27f5459f7d046", - "sources": "e8b58f68d193e51f7a4b195aa7586f358c6c184d14764e0d8e155614508f6075" + "jar": "5a919ad88b6d9e9f08c3069980bc656a62926a00e6ba2da5859aa0ee4e202e44", + "sources": "d0c62a058047fa34b2798adb766a968516f27897a6c81cc89a3f60a01a5554f0" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-handler-proxy": { "shasums": { - "jar": "a61bbbbe33c116a278b1e5baa567c6b5d6bd77814360870093bf6e51c12c6157", - "sources": "dbf11d2c29e5fb707ab7e7cb346497cbbc5481d1ff39ed9e0bd67ece93c93d1b" + "jar": "829a9c49afe0cb72d8c27a067d6bd61afb698ffa0db8117411b7437ecd83db7a", + "sources": "67cfaa69d8af1f9aa26b5d7bafde6856c3eebc085b5f772f13fc0e30010153d5" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-resolver": { "shasums": { - "jar": "7d1cf459a1094cdefdae457686118d9dcc00d96b0ad1cea798483a43ffca1064", - "sources": "dd7e89f78a5550712ff52dd6a97d8adf1faa7a1d78aed45cbc45e9f76a2c1134" + "jar": "404958b8f0590ee526013d011cd2354dab78adbaad743d7d444db33a3f9eabac", + "sources": "ee95bd01f3c06cebb78ae1a8c09a96650f1be5f423e47d69bb3004010807a489" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-resolver-dns": { "shasums": { - "jar": "a1b7fef032fce3446a7307e5aeb02126d92c0b38f00aae4f2f0de65d3215cd90", - "sources": "4116ddb2af3d20d55b99c9c17d594e461dc5d26e871d0daf0fb8abb94832158d" + "jar": "f40076554db69eec20e0f8de5c92a540d3c50909e416d2c7d8f7e1b27d84b4a8", + "sources": "2f9b1e3f239f4ebebe6b314914aa6ae53c3eb173dbe4794db2730717e79e8a33" }, - "version": "4.1.101.Final" + "version": "4.1.104.Final" }, "io.netty:netty-transport": { "shasums": { - "jar": "28fd78156e8908146e66d247985aa5018a4bce9503c5b3d883481448b23270d3", - "sources": "91ee6de4bba5621e0cf78233254a6e27ae363244b15b425b148074c3a89909b7" + "jar": "23ea9a39009b41e9d0aa1515b3073af9ee4da4e16c2e869b5aa8aa9f109d4251", + "sources": "7e69c12c5a160af900ebba3aa00a7c41e9072fca5ee78ea41b4ddcdaf398b492" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.netty:netty-transport-native-unix-common": { "shasums": { - "jar": "c12f39c8f12a6ba64078caf75fd97a7fbd05643001f424e8b84829b35d402f4e", - "sources": "9b7cd573f01b2210131ac16189af586a4a097f4edd13f9969c71c7488c63d285" + "jar": "f52d4b38c571066bfaae964a7867fa937f0e54fb5ff467c576cb650a20a854e8", + "sources": "9e7893c3c8538d7f948a5aabae1f0eecd8ce8fb6ad22f48b09c9124058695ca7" }, - "version": "4.1.104.Final" + "version": "4.1.106.Final" }, "io.opentelemetry.semconv:opentelemetry-semconv": { "shasums": { @@ -334,94 +334,94 @@ }, "io.opentelemetry:opentelemetry-api": { "shasums": { - "jar": "f3bf6f0ded42812cb41f88f7bfe5812e28f76b94679ff69ac4c2cc6aec12a267", - "sources": "da4e5f96b3c44797d994c38e73c57488141235de1d6493f1aaf21516c9df7f4a" + "jar": "3820fbe846e9f3cad55f0fe1ba72467da9343d1a14cc7a7bd536d4040ab17df9", + "sources": "dad218a595d81790e6cff69a9fa5350e4252d4d35696c6a16deb08d74b220bd6" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-api-events": { "shasums": { - "jar": "27016923be7cf92568a8ad596797cf2ec00d242e775ffa7c3fb65bf15b268fba", - "sources": "35746fba74c7703561be68933a6a17323b9b3752a9a8ac91d6d62b265e87188b" + "jar": "f79a27b8300ddb57eb21c7d662db469b34d9f86253529c720eb067ce55c1b345", + "sources": "004befb8e11373ece1d1e87ad2126479fd5e4b5ca99a097bdb27c4913aafe70c" }, - "version": "1.33.0-alpha" + "version": "1.34.1-alpha" }, "io.opentelemetry:opentelemetry-context": { "shasums": { - "jar": "8aa867f353036c6a8e8bf06ae2fec54658d8eafda82f857506ff934fd403048a", - "sources": "34a17f4a25995243ccb8b63fcf3b27e922d2a785496b4cb46b406e39b6208015" + "jar": "62d34f3dbf37783dc0223afe612bccecdccf404eb25cef95a3ab90fcaa689975", + "sources": "ff18ed9626cc2865963b4c248a83baebb3eade37eef902a9edac83096834f2e4" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-exporter-logging": { "shasums": { - "jar": "d548ce63e219abbbcf67b45affc5a15579962078d783d1a89f6eba9985723d8f", - "sources": "a6f37c6c47f0f2be34e34f9f4c70b6ae0ea8967b128b448ec93001ed5a685b81" + "jar": "ebe441682652ad91cf4a6daf7d17974f31571dc21dc5d8c60b21d1c2986270f1", + "sources": "7128531aed3017840193e6c1fde8af5ded44b9b9ac1ef70c3d0b1680648024e2" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-extension-incubator": { "shasums": { - "jar": "18123858e17f0aed3cb029562add36b47e1a302707fd2948ce2cb19f679863fc", - "sources": "1b477c0eb0f497fece039a12f42bfe5e3d2d4924a09b97aca1392e15a197f95e" + "jar": "63f7948e7d34b81b8adb11ac8cee5738a333e57954c7da28231eca168656514d", + "sources": "464fc29e010668b209e8754b30e6b9650a447c12aa2109f8a19899ce2a7612c1" }, - "version": "1.33.0-alpha" + "version": "1.34.1-alpha" }, "io.opentelemetry:opentelemetry-sdk": { "shasums": { - "jar": "8a9b32722e9732d4c22402e1351dbd4cec5131447f151b560a184a4680e67d84", - "sources": "bdccb49cae5aea8029c603f17e95f986e2d3a831d43bb41a2489466bd38c6dd9" + "jar": "de1f9ab3f1d0ddfcf6d698f3059352f6ecfbdff4318424eeca62e1eea6b745cd", + "sources": "5d96356bb6dfec674c72f4d627c1a539b357315d2e0a17fb109ae657f9b794e6" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-common": { "shasums": { - "jar": "b344a6d2d5f82c03615c7b84f2ea6b666a86ec1ae5da27121179d349579e811f", - "sources": "51ee1e4ff1c1d42dda4f23616f1a99442682d4fa6c9be219e76945fcb869d52b" + "jar": "bfe9c8efe2c397294527b9a347934187f9b0de805d2cad642017ec7d9b71afc5", + "sources": "3e66c9ef8c1eded8ddd9624d92a61310c2084c498d9a76d34a3a4f6f761ecf66" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure": { "shasums": { - "jar": "30d9368e3fd812b148b78460c55de4e3092931c1be40c935123f00bcd3bc86ed", - "sources": "421002ec45e634fd612f6e5241f82483186ef60b2de85b9c52018944c89ec40b" + "jar": "7332d834f3b35082550a22c99db52596b6d9d9b344076210e4a3bc0627704356", + "sources": "190f7e9246f3248f9880008fc5447399a3bb94e2c5cc3b75df1ce54605953a69" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi": { "shasums": { - "jar": "ed8e236e1ad56721ceed9df349b9b9b25f8fd8d603a1f8840ee517516894c736", - "sources": "f184bf2d58d71df8e0bf493ad8e35f0e98c81d5a50efc27146b2d43db4e36f7d" + "jar": "5a3bc2619fa50f176c21abf08ecfa98dd8e8980f154cca2b74a0a74e7d1cf473", + "sources": "74408a88c497e4ed859ff2529fdfc353a0910e66d46d37c7adf59a70966abb0e" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-logs": { "shasums": { - "jar": "2e0be0791f28595388cf922c145ab7ad889395935b3b45c4ec606b7b5604116f", - "sources": "ced5036da94572576212061314ecb1a766c1c53e31fab8d85bd2668e783a94f2" + "jar": "0bf40a630aa4115fd549fdd7dcf77eb1f6c079e0d02ab0d81a415d5fb0848f35", + "sources": "e6bcf41a857fe1ad43b84367f407b0df8ffbf34f8f6ab9c19356cad9c76e7bbe" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-metrics": { "shasums": { - "jar": "62fb0c0839538adf9b6976d352f06e46adc2a54e79043ff7934c1ae0fc114b4e", - "sources": "e46ca8c65e839b5b6ad06e28926daf83c6b1b5e00f42c3dbf28248012a46a1ab" + "jar": "a983e742c26006ba08888a5fb89f085f92dd81c923febe3ac5c6259b7ec9935d", + "sources": "d94634ef319b19fc6701786c75100cacb057857cd614c9ec9d8b5becd6087ad9" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-testing": { "shasums": { - "jar": "c75adc09985a49467a0d8a413a9d76f69760325aaf7368f04b5c2e0465e541d8", - "sources": "c2aaa9739c36a57ae3f1ed8b4ed7aefba3d19060f3a71563ae0bc526bdd6fd97" + "jar": "15cf6d948e3c7822b8c3ea97058115b3972da1909e8e954eab568d643c471ff5", + "sources": "785fe453db6b77fe748c910fd7e72a7ad47437853b3eee53b17356e51eb8eea8" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.opentelemetry:opentelemetry-sdk-trace": { "shasums": { - "jar": "dd9c2a5949263cc7777720090c11036221ddce4a5fa33d65d4bae47ba157178a", - "sources": "9e09c2f8f78d13c8da5ad183158df03f610ff5922596a8e8c6dbaca528b55225" + "jar": "973b2d7b70cdd7a6ac122b1e2e7a756f18840b6bfddccb3710f59d5c18ec7b6c", + "sources": "0c5602581d96d7afc97d153ecef1b256e404ef005e42c39fc7a5e612d6769389" }, - "version": "1.33.0" + "version": "1.34.1" }, "io.ous:jtoml": { "shasums": { @@ -432,10 +432,10 @@ }, "io.projectreactor:reactor-core": { "shasums": { - "jar": "1b37779edf618eb526d27986329740fa5c25c61568ca812812d0cca127ceeac1", - "sources": "daf5a79a7b462122794f7073075aabe79a6c077a8c44a8bf0e7bd5c847dd679e" + "jar": "6e235f0be9732ebd6a42c585dfd53274065978bfbc28d721d7ecf487fde27b52", + "sources": "57e48b121636923ec362aa337556150edc8bc29ccba686c21d36016e05207b23" }, - "version": "3.6.0" + "version": "3.6.2" }, "io.reactivex.rxjava3:rxjava": { "shasums": { @@ -474,10 +474,10 @@ }, "net.bytebuddy:byte-buddy-agent": { "shasums": { - "jar": "67993a89d47ca58ff868802a4448ddd150e5fe4e5a5645ded990d7b4d557a6b9", - "sources": "aebd1ea7ef0cf57d7ce3dfcf7ab73479c5a8158144a4d2bece6dd2587674b3ea" + "jar": "2f537a621a64fa7013d68c695a76a34ee8d79dad74e635caca16dd56257aeb80", + "sources": "1e3618de3b0f81a43c7480aea392dd7905f9dce275e6665003ec331b4531ced4" }, - "version": "1.14.10" + "version": "1.14.11" }, "net.sf.saxon:Saxon-HE": { "shasums": { @@ -537,17 +537,17 @@ }, "org.apache.logging.log4j:log4j-api": { "shasums": { - "jar": "1342c86c2a0848fc2f3d16b8544849f29fa31bf7af79f6066c2677ba29e47cf3", - "sources": "f5a159788be335a4458f4b1330a13a9ab9c7f52a17897f8445d9cde8d9c8e411" + "jar": "5d7beae7ff15d8516d6517121d7f12a79a6ac180df64b5fcec55d5be21056e53", + "sources": "da73464bd4887421a2b0677f8e29158e5af8642f0a8523a99cec6064b637197d" }, - "version": "2.22.0" + "version": "2.22.1" }, "org.apache.logging.log4j:log4j-core": { "shasums": { - "jar": "aacb1b935c0070f644060c1fbc9b555f344cbfe8d0ef1234b464eb58bd7b8ad2", - "sources": "3a1f8e5b74026f4950feb125b9cdc0ddd46364e6b4d971af2a543555e92b4d09" + "jar": "46dccecac556623d8e2ce8648496824a82951d139062a4e61148aff1a25ed18d", + "sources": "07eaa7939a5940c7c99f5acfda3a06dbb04d74f083455b535e42811a45c1b07e" }, - "version": "2.22.0" + "version": "2.22.1" }, "org.apiguardian:apiguardian-api": { "shasums": { @@ -558,10 +558,10 @@ }, "org.assertj:assertj-core": { "shasums": { - "jar": "df3d0b348f1fe806bdddcb10fa4ae63c6679e9888d4bc7055f09848517976aa3", - "sources": "67cbf29f82539b16e985a073937b19373443af000983986d05a5962ff9108fa7" + "jar": "620da4e4de03108c2f412ec17a7ed44b0112dc65e181bd0732dc96fa3b65356f", + "sources": "511d810fd60b6d4874326354eff9e657bbe37fa3a2b8658f22c49a48fe5fa195" }, - "version": "3.24.2" + "version": "3.25.1" }, "org.bouncycastle:bcpkix-jdk18on": { "shasums": { @@ -614,10 +614,10 @@ }, "org.htmlunit:htmlunit-core-js": { "shasums": { - "jar": "8e67c1435dac87884300dfe91e7c4900275c4328ac9432d4aec955e3f2f3ab16", - "sources": "e381737dcd02d18300bb62d64350960dd6ebdeeed032d119bb1d258d49718e5c" + "jar": "3c0a5b41e073fac91272bca9a252be88ef2a2bc33f0413c4b7adf5a71cf64e94", + "sources": "fd1757e62c918051000fb08702f30ef898b73baabcb06de23be84149941ad489" }, - "version": "3.9.0" + "version": "3.10.0" }, "org.jboss.marshalling:jboss-marshalling": { "shasums": { @@ -698,10 +698,10 @@ }, "org.mockito:mockito-core": { "shasums": { - "jar": "c320f662a03c2951edcc51a44b64d79a8e994373ff548453b5fdaf69debe4682", - "sources": "c47a3b0a3a4766a058d3fc458eea45420fdd4e39ef4d09d88cc70d002fdf4386" + "jar": "bbad9185ed734965fac7e367f0e51596f69531e51d8b2cbcec1048dd6fb41f2c", + "sources": "3da5c463fe8daeec00829a9d6eaaea59e552fca3114be918cfcb01d52fd2c6a1" }, - "version": "5.8.0" + "version": "5.9.0" }, "org.mockito:mockito-inline": { "shasums": { @@ -768,24 +768,24 @@ }, "org.redisson:redisson": { "shasums": { - "jar": "8219a757a49087fa468163706b05356176fbe41f5c1fc2be756cd6c9e41b5924", - "sources": "87f895c24e641bd676e19aefea5123aaa45bce2b9a09efa3ae09a45ba6839dfb" + "jar": "20ad8dbd0a55d0d0f41b0d91aaed5b08dcb8fe41a698df58bd52763db1a2653b", + "sources": "c39037b2195417b347eb3463e6ed7f80510a389ad65d8648211000a151b20bea" }, - "version": "3.25.2" + "version": "3.26.0" }, "org.slf4j:slf4j-api": { "shasums": { - "jar": "0818930dc8d7debb403204611691da58e49d42c50b6ffcfdce02dadb7c3c2b6c", - "sources": "0d83bc49452416dd121ee41cebf41cdc64b69e7f7fdc97c2762ec406336c7ad3" + "jar": "ce0e71d673acb9036bb55d0244b261cf033f8e4c1245f14f931dfb1937dd4c95", + "sources": "3c1357260d1c649aa747bc6ba7b78fb6ea1bd2f7e6fabd9c6412e9d5c6e2ea0c" }, - "version": "2.0.9" + "version": "2.0.11" }, "org.slf4j:slf4j-jdk14": { "shasums": { - "jar": "1052aa82851c36f76465e64539ad4450338a86094e638a5cb1b3ce7a0dabfb18", - "sources": "a9386cb9fe3e29aad418a945c5f1c21947695de5fbf955151ff69ba66f147cf3" + "jar": "1ce8ae1f20dec00a0ac08bb92a773168a57651bac69869a457285a5a7c8c7097", + "sources": "66146380abf8465c53599d76b480167476ae2f5ce795ef82109c5cdb83d6bea3" }, - "version": "2.0.9" + "version": "2.0.11" }, "org.slf4j:slf4j-simple": { "shasums": { @@ -804,10 +804,10 @@ }, "org.yaml:snakeyaml": { "shasums": { - "jar": "69a4537045ddbcaed4c68eef074462eb12d324d7953f62c5ecd35df645e8aec9", - "sources": "73380d803d59b1db194521449d2cc3617a2d5a0eb5528cdc2cd70fdaa4074de0" + "jar": "1467931448a0817696ae2805b7b8b20bfb082652bf9c4efaed528930dc49389b", + "sources": "8f7cf911cf63db55fd980a926d155bd846317737351a2f48ef1c1088c414538a" }, - "version": "2.1" + "version": "2.2" }, "org.zeromq:jeromq": { "shasums": { @@ -832,9 +832,6 @@ "com.fasterxml.jackson.core:jackson-databind", "org.yaml:snakeyaml" ], - "com.github.javaparser:javaparser-core": [ - "com.google.guava:guava" - ], "com.github.spotbugs:spotbugs": [ "com.github.spotbugs:spotbugs-annotations", "com.github.stephenc.jcip:jcip-annotations", @@ -2763,6 +2760,7 @@ "org.redisson.api.map", "org.redisson.api.map.event", "org.redisson.api.mapreduce", + "org.redisson.api.options", "org.redisson.api.queue", "org.redisson.api.redisnode", "org.redisson.api.search", diff --git a/java/src/org/openqa/selenium/devtools/v118/BUILD.bazel b/java/src/org/openqa/selenium/devtools/v121/BUILD.bazel similarity index 98% rename from java/src/org/openqa/selenium/devtools/v118/BUILD.bazel rename to java/src/org/openqa/selenium/devtools/v121/BUILD.bazel index 98f55addb160b..8e93a15944fb4 100644 --- a/java/src/org/openqa/selenium/devtools/v118/BUILD.bazel +++ b/java/src/org/openqa/selenium/devtools/v121/BUILD.bazel @@ -2,7 +2,7 @@ load("//common:defs.bzl", "copy_file") load("//java:defs.bzl", "java_export", "java_library") load("//java:version.bzl", "SE_VERSION") -cdp_version = "v118" +cdp_version = "v121" java_export( name = cdp_version, diff --git a/java/src/org/openqa/selenium/devtools/v118/v118CdpInfo.java b/java/src/org/openqa/selenium/devtools/v121/v121CdpInfo.java similarity index 86% rename from java/src/org/openqa/selenium/devtools/v118/v118CdpInfo.java rename to java/src/org/openqa/selenium/devtools/v121/v121CdpInfo.java index 5266ef6626e21..f33326d67c591 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118CdpInfo.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121CdpInfo.java @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import com.google.auto.service.AutoService; import org.openqa.selenium.devtools.CdpInfo; @AutoService(CdpInfo.class) -public class v118CdpInfo extends CdpInfo { +public class v121CdpInfo extends CdpInfo { - public v118CdpInfo() { - super(118, v118Domains::new); + public v121CdpInfo() { + super(121, v121Domains::new); } } diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Domains.java b/java/src/org/openqa/selenium/devtools/v121/v121Domains.java similarity index 77% rename from java/src/org/openqa/selenium/devtools/v118/v118Domains.java rename to java/src/org/openqa/selenium/devtools/v121/v121Domains.java index 0985ae1ce9860..7975902fb5fcc 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118Domains.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121Domains.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.idealized.Domains; @@ -26,21 +26,21 @@ import org.openqa.selenium.devtools.idealized.target.Target; import org.openqa.selenium.internal.Require; -public class v118Domains implements Domains { +public class v121Domains implements Domains { - private final v118Javascript js; - private final v118Events events; - private final v118Log log; - private final v118Network network; - private final v118Target target; + private final v121Javascript js; + private final v121Events events; + private final v121Log log; + private final v121Network network; + private final v121Target target; - public v118Domains(DevTools devtools) { + public v121Domains(DevTools devtools) { Require.nonNull("DevTools", devtools); - events = new v118Events(devtools); - js = new v118Javascript(devtools); - log = new v118Log(); - network = new v118Network(devtools); - target = new v118Target(); + events = new v121Events(devtools); + js = new v121Javascript(devtools); + log = new v121Log(); + network = new v121Network(devtools); + target = new v121Target(); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Events.java b/java/src/org/openqa/selenium/devtools/v121/v121Events.java similarity index 86% rename from java/src/org/openqa/selenium/devtools/v118/v118Events.java rename to java/src/org/openqa/selenium/devtools/v121/v121Events.java index 0dde35dc7023c..0148e8f42a52c 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118Events.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121Events.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import java.time.Instant; import java.util.List; @@ -28,15 +28,15 @@ import org.openqa.selenium.devtools.events.ConsoleEvent; import org.openqa.selenium.devtools.idealized.Events; import org.openqa.selenium.devtools.idealized.runtime.model.RemoteObject; -import org.openqa.selenium.devtools.v118.runtime.Runtime; -import org.openqa.selenium.devtools.v118.runtime.model.ConsoleAPICalled; -import org.openqa.selenium.devtools.v118.runtime.model.ExceptionDetails; -import org.openqa.selenium.devtools.v118.runtime.model.ExceptionThrown; -import org.openqa.selenium.devtools.v118.runtime.model.StackTrace; +import org.openqa.selenium.devtools.v121.runtime.Runtime; +import org.openqa.selenium.devtools.v121.runtime.model.ConsoleAPICalled; +import org.openqa.selenium.devtools.v121.runtime.model.ExceptionDetails; +import org.openqa.selenium.devtools.v121.runtime.model.ExceptionThrown; +import org.openqa.selenium.devtools.v121.runtime.model.StackTrace; -public class v118Events extends Events { +public class v121Events extends Events { - public v118Events(DevTools devtools) { + public v121Events(DevTools devtools) { super(devtools); } @@ -77,7 +77,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) { protected JavascriptException toJsException(ExceptionThrown event) { ExceptionDetails details = event.getExceptionDetails(); Optional maybeTrace = details.getStackTrace(); - Optional maybeException = + Optional maybeException = details.getException(); String message = diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Javascript.java b/java/src/org/openqa/selenium/devtools/v121/v121Javascript.java similarity index 85% rename from java/src/org/openqa/selenium/devtools/v118/v118Javascript.java rename to java/src/org/openqa/selenium/devtools/v121/v121Javascript.java index 987e170321645..f6fe984321300 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118Javascript.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121Javascript.java @@ -15,21 +15,21 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import java.util.Optional; import org.openqa.selenium.devtools.Command; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.idealized.Javascript; -import org.openqa.selenium.devtools.v118.page.Page; -import org.openqa.selenium.devtools.v118.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v118.runtime.Runtime; -import org.openqa.selenium.devtools.v118.runtime.model.BindingCalled; +import org.openqa.selenium.devtools.v121.page.Page; +import org.openqa.selenium.devtools.v121.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.v121.runtime.Runtime; +import org.openqa.selenium.devtools.v121.runtime.model.BindingCalled; -public class v118Javascript extends Javascript { +public class v121Javascript extends Javascript { - public v118Javascript(DevTools devtools) { + public v121Javascript(DevTools devtools) { super(devtools); } diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Log.java b/java/src/org/openqa/selenium/devtools/v121/v121Log.java similarity index 89% rename from java/src/org/openqa/selenium/devtools/v118/v118Log.java rename to java/src/org/openqa/selenium/devtools/v121/v121Log.java index b7eb6a55e423f..84528c1710637 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118Log.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121Log.java @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import java.util.function.Function; import java.util.logging.Level; import org.openqa.selenium.devtools.Command; import org.openqa.selenium.devtools.ConverterFunctions; import org.openqa.selenium.devtools.Event; -import org.openqa.selenium.devtools.v118.log.Log; -import org.openqa.selenium.devtools.v118.log.model.LogEntry; -import org.openqa.selenium.devtools.v118.runtime.model.Timestamp; +import org.openqa.selenium.devtools.v121.log.Log; +import org.openqa.selenium.devtools.v121.log.model.LogEntry; +import org.openqa.selenium.devtools.v121.runtime.model.Timestamp; import org.openqa.selenium.json.JsonInput; -public class v118Log implements org.openqa.selenium.devtools.idealized.log.Log { +public class v121Log implements org.openqa.selenium.devtools.idealized.log.Log { @Override public Command enable() { diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Network.java b/java/src/org/openqa/selenium/devtools/v121/v121Network.java similarity index 92% rename from java/src/org/openqa/selenium/devtools/v118/v118Network.java rename to java/src/org/openqa/selenium/devtools/v121/v121Network.java index 4eee5cdc79151..0addc563c8120 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118Network.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121Network.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import static java.net.HttpURLConnection.HTTP_OK; @@ -30,35 +30,35 @@ import org.openqa.selenium.devtools.DevToolsException; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.idealized.Network; -import org.openqa.selenium.devtools.v118.fetch.Fetch; -import org.openqa.selenium.devtools.v118.fetch.model.*; -import org.openqa.selenium.devtools.v118.network.model.Request; +import org.openqa.selenium.devtools.v121.fetch.Fetch; +import org.openqa.selenium.devtools.v121.fetch.model.*; +import org.openqa.selenium.devtools.v121.network.model.Request; import org.openqa.selenium.internal.Either; import org.openqa.selenium.remote.http.HttpRequest; import org.openqa.selenium.remote.http.HttpResponse; -public class v118Network extends Network { +public class v121Network extends Network { - private static final Logger LOG = Logger.getLogger(v118Network.class.getName()); + private static final Logger LOG = Logger.getLogger(v121Network.class.getName()); - public v118Network(DevTools devTools) { + public v121Network(DevTools devTools) { super(devTools); } @Override protected Command setUserAgentOverride(UserAgent userAgent) { - return org.openqa.selenium.devtools.v118.network.Network.setUserAgentOverride( + return org.openqa.selenium.devtools.v121.network.Network.setUserAgentOverride( userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty()); } @Override protected Command enableNetworkCaching() { - return org.openqa.selenium.devtools.v118.network.Network.setCacheDisabled(false); + return org.openqa.selenium.devtools.v121.network.Network.setCacheDisabled(false); } @Override protected Command disableNetworkCaching() { - return org.openqa.selenium.devtools.v118.network.Network.setCacheDisabled(true); + return org.openqa.selenium.devtools.v121.network.Network.setCacheDisabled(true); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Target.java b/java/src/org/openqa/selenium/devtools/v121/v121Target.java similarity index 83% rename from java/src/org/openqa/selenium/devtools/v118/v118Target.java rename to java/src/org/openqa/selenium/devtools/v121/v121Target.java index ce441bd32caf5..33528c10a21a5 100644 --- a/java/src/org/openqa/selenium/devtools/v118/v118Target.java +++ b/java/src/org/openqa/selenium/devtools/v121/v121Target.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v118; +package org.openqa.selenium.devtools.v121; import java.util.List; import java.util.Map; @@ -28,21 +28,21 @@ import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID; import org.openqa.selenium.devtools.idealized.target.model.SessionID; import org.openqa.selenium.devtools.idealized.target.model.TargetID; -import org.openqa.selenium.devtools.v118.target.Target; -import org.openqa.selenium.devtools.v118.target.model.TargetInfo; +import org.openqa.selenium.devtools.v121.target.Target; +import org.openqa.selenium.devtools.v121.target.model.TargetInfo; import org.openqa.selenium.json.JsonInput; import org.openqa.selenium.json.TypeToken; -public class v118Target implements org.openqa.selenium.devtools.idealized.target.Target { +public class v121Target implements org.openqa.selenium.devtools.idealized.target.Target { @Override public Command detachFromTarget( Optional sessionId, Optional targetId) { return Target.detachFromTarget( sessionId.map( - id -> new org.openqa.selenium.devtools.v118.target.model.SessionID(id.toString())), + id -> new org.openqa.selenium.devtools.v121.target.model.SessionID(id.toString())), targetId.map( - id -> new org.openqa.selenium.devtools.v118.target.model.TargetID(id.toString()))); + id -> new org.openqa.selenium.devtools.v121.target.model.TargetID(id.toString()))); } @Override @@ -74,19 +74,19 @@ public Command detachFromTarget( @Override public Command attachToTarget(TargetID targetId) { - Function mapper = + Function mapper = ConverterFunctions.map( - "sessionId", org.openqa.selenium.devtools.v118.target.model.SessionID.class); + "sessionId", org.openqa.selenium.devtools.v121.target.model.SessionID.class); return new Command<>( "Target.attachToTarget", Map.of( "targetId", - new org.openqa.selenium.devtools.v118.target.model.TargetID(targetId.toString()), + new org.openqa.selenium.devtools.v121.target.model.TargetID(targetId.toString()), "flatten", true), input -> { - org.openqa.selenium.devtools.v118.target.model.SessionID id = mapper.apply(input); + org.openqa.selenium.devtools.v121.target.model.SessionID id = mapper.apply(input); return new SessionID(id.toString()); }); } @@ -101,9 +101,9 @@ public Event detached() { return new Event<>( "Target.detachedFromTarget", input -> { - Function converter = + Function converter = ConverterFunctions.map( - "targetId", org.openqa.selenium.devtools.v118.target.model.TargetID.class); + "targetId", org.openqa.selenium.devtools.v121.target.model.TargetID.class); return new TargetID(converter.apply(input).toString()); }); } diff --git a/java/src/org/openqa/selenium/devtools/versions.bzl b/java/src/org/openqa/selenium/devtools/versions.bzl index ecb520a870372..bbf0e350a1f3a 100644 --- a/java/src/org/openqa/selenium/devtools/versions.bzl +++ b/java/src/org/openqa/selenium/devtools/versions.bzl @@ -2,7 +2,7 @@ CDP_VERSIONS = [ "v85", # Required by Firefox "v119", "v120", - "v118", + "v121", ] CDP_DEPS = ["//java/src/org/openqa/selenium/devtools/%s" % v for v in CDP_VERSIONS] diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel index 3b9514fb08b72..53c8ffe5a36f4 100644 --- a/javascript/node/selenium-webdriver/BUILD.bazel +++ b/javascript/node/selenium-webdriver/BUILD.bazel @@ -6,7 +6,7 @@ BROWSER_VERSIONS = [ "v85", "v119", "v120", - "v118", + "v121", ] SRC_FILES = [ diff --git a/py/BUILD.bazel b/py/BUILD.bazel index 22a4ae4e81a32..b9a8e4183cbf2 100644 --- a/py/BUILD.bazel +++ b/py/BUILD.bazel @@ -26,7 +26,7 @@ BROWSER_VERSIONS = [ "v85", "v119", "v120", - "v118", + "v121", ] TEST_DEPS = [ diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock index 8ce32e2951d64..4ef318a6f4fd1 100644 --- a/rb/Gemfile.lock +++ b/rb/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - selenium-devtools (0.120.0) + selenium-devtools (0.121.0) selenium-webdriver (~> 4.2) selenium-webdriver (4.17.0.nightly) base64 (~> 0.2) diff --git a/rb/lib/selenium/devtools/BUILD.bazel b/rb/lib/selenium/devtools/BUILD.bazel index faa5a251c367e..c94bb6ee38fda 100644 --- a/rb/lib/selenium/devtools/BUILD.bazel +++ b/rb/lib/selenium/devtools/BUILD.bazel @@ -7,7 +7,7 @@ CDP_VERSIONS = [ "v85", "v119", "v120", - "v118", + "v121", ] rb_library( diff --git a/rb/lib/selenium/devtools/version.rb b/rb/lib/selenium/devtools/version.rb index 0942bc8334c6f..a87c1bab56f74 100644 --- a/rb/lib/selenium/devtools/version.rb +++ b/rb/lib/selenium/devtools/version.rb @@ -19,6 +19,6 @@ module Selenium module DevTools - VERSION = '0.120.0' + VERSION = '0.121.0' end # DevTools end # Selenium