From 617664cb22a5e0c6f284aefd332e1c8f35762e28 Mon Sep 17 00:00:00 2001
From: zapbot <12745184+zapbot@users.noreply.github.com>
Date: Wed, 18 Dec 2024 23:05:56 +0000
Subject: [PATCH 1/2] Webdriver Update
ChromeDriver update to 131.0.6778.204
Signed-off-by: zapbot <12745184+zapbot@users.noreply.github.com>
---
addOns/webdrivers/webdriverlinux/CHANGELOG.md | 2 +-
.../webdriverlinux/resources/help/contents/webdriverlinux.html | 2 +-
addOns/webdrivers/webdrivermacos/CHANGELOG.md | 2 +-
.../webdrivermacos/resources/help/contents/webdrivermacos.html | 2 +-
addOns/webdrivers/webdrivers.gradle.kts | 2 +-
addOns/webdrivers/webdriverwindows/CHANGELOG.md | 2 +-
.../resources/help/contents/webdriverwindows.html | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/addOns/webdrivers/webdriverlinux/CHANGELOG.md b/addOns/webdrivers/webdriverlinux/CHANGELOG.md
index 8fd5925e0b..a4ad8d5063 100644
--- a/addOns/webdrivers/webdriverlinux/CHANGELOG.md
+++ b/addOns/webdrivers/webdriverlinux/CHANGELOG.md
@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Changed
-- Update ChromeDriver to 131.0.6778.108.
+- Update ChromeDriver to 131.0.6778.204.
- Update minimum ZAP version to 2.16.0.
## [116] - 2024-12-04
diff --git a/addOns/webdrivers/webdriverlinux/src/main/javahelp/org/zaproxy/zap/extension/webdriverlinux/resources/help/contents/webdriverlinux.html b/addOns/webdrivers/webdriverlinux/src/main/javahelp/org/zaproxy/zap/extension/webdriverlinux/resources/help/contents/webdriverlinux.html
index 19a810759c..ec9514196b 100644
--- a/addOns/webdrivers/webdriverlinux/src/main/javahelp/org/zaproxy/zap/extension/webdriverlinux/resources/help/contents/webdriverlinux.html
+++ b/addOns/webdrivers/webdriverlinux/src/main/javahelp/org/zaproxy/zap/extension/webdriverlinux/resources/help/contents/webdriverlinux.html
@@ -9,7 +9,7 @@
Linux WebDrivers
The Linux WebDrivers add-on provides WebDrivers for the following browsers:
- - Chrome - ChromeDriver 131.0.6778.108
+ - Chrome - ChromeDriver 131.0.6778.204
- Firefox - geckodriver 0.35.0
diff --git a/addOns/webdrivers/webdrivermacos/CHANGELOG.md b/addOns/webdrivers/webdrivermacos/CHANGELOG.md
index 93dc48bd4a..b34429dfe1 100644
--- a/addOns/webdrivers/webdrivermacos/CHANGELOG.md
+++ b/addOns/webdrivers/webdrivermacos/CHANGELOG.md
@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Changed
-- Update ChromeDriver to 131.0.6778.108.
+- Update ChromeDriver to 131.0.6778.204.
- Update minimum ZAP version to 2.16.0.
## [116] - 2024-12-04
diff --git a/addOns/webdrivers/webdrivermacos/src/main/javahelp/org/zaproxy/zap/extension/webdrivermacos/resources/help/contents/webdrivermacos.html b/addOns/webdrivers/webdrivermacos/src/main/javahelp/org/zaproxy/zap/extension/webdrivermacos/resources/help/contents/webdrivermacos.html
index 82abc48626..b6240cdd38 100644
--- a/addOns/webdrivers/webdrivermacos/src/main/javahelp/org/zaproxy/zap/extension/webdrivermacos/resources/help/contents/webdrivermacos.html
+++ b/addOns/webdrivers/webdrivermacos/src/main/javahelp/org/zaproxy/zap/extension/webdrivermacos/resources/help/contents/webdrivermacos.html
@@ -9,7 +9,7 @@ MacOS WebDrivers
The MacOS WebDrivers add-on provides WebDrivers for the following browsers:
- - Chrome - ChromeDriver 131.0.6778.108
+ - Chrome - ChromeDriver 131.0.6778.204
- Firefox - geckodriver 0.35.0
diff --git a/addOns/webdrivers/webdrivers.gradle.kts b/addOns/webdrivers/webdrivers.gradle.kts
index 55e63f681a..ff75c2de86 100644
--- a/addOns/webdrivers/webdrivers.gradle.kts
+++ b/addOns/webdrivers/webdrivers.gradle.kts
@@ -6,7 +6,7 @@ import org.zaproxy.gradle.tasks.DownloadWebDriver
description = "Common configuration of the WebDriver add-ons."
val geckodriverVersion = "0.35.0"
-val chromeDriverVersion = "131.0.6778.108"
+val chromeDriverVersion = "131.0.6778.204"
fun configureDownloadTask(
outputDir: File,
diff --git a/addOns/webdrivers/webdriverwindows/CHANGELOG.md b/addOns/webdrivers/webdriverwindows/CHANGELOG.md
index 4bfa2295c2..e49e3c2613 100644
--- a/addOns/webdrivers/webdriverwindows/CHANGELOG.md
+++ b/addOns/webdrivers/webdriverwindows/CHANGELOG.md
@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Changed
-- Update ChromeDriver to 131.0.6778.108.
+- Update ChromeDriver to 131.0.6778.204.
- Update minimum ZAP version to 2.16.0.
## [116] - 2024-12-04
diff --git a/addOns/webdrivers/webdriverwindows/src/main/javahelp/org/zaproxy/zap/extension/webdriverwindows/resources/help/contents/webdriverwindows.html b/addOns/webdrivers/webdriverwindows/src/main/javahelp/org/zaproxy/zap/extension/webdriverwindows/resources/help/contents/webdriverwindows.html
index fbfd6df602..405d45c37e 100644
--- a/addOns/webdrivers/webdriverwindows/src/main/javahelp/org/zaproxy/zap/extension/webdriverwindows/resources/help/contents/webdriverwindows.html
+++ b/addOns/webdrivers/webdriverwindows/src/main/javahelp/org/zaproxy/zap/extension/webdriverwindows/resources/help/contents/webdriverwindows.html
@@ -9,7 +9,7 @@ Windows WebDrivers
The Windows WebDrivers add-on provides WebDrivers for the following browsers:
- - Chrome - ChromeDriver 131.0.6778.108
+ - Chrome - ChromeDriver 131.0.6778.204
- Firefox - geckodriver 0.35.0
From 1049fed5e1df6b7229e46a1d0ae9ca4c9c1b753c Mon Sep 17 00:00:00 2001
From: thc202
Date: Thu, 19 Dec 2024 09:32:49 +0000
Subject: [PATCH 2/2] Revert ZAP version back to 2.15
Allow to release to 2.15 in the meantime.
Signed-off-by: thc202
---
addOns/webdrivers/webdriverlinux/CHANGELOG.md | 1 -
addOns/webdrivers/webdrivermacos/CHANGELOG.md | 1 -
addOns/webdrivers/webdrivers.gradle.kts | 2 ++
addOns/webdrivers/webdriverwindows/CHANGELOG.md | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/addOns/webdrivers/webdriverlinux/CHANGELOG.md b/addOns/webdrivers/webdriverlinux/CHANGELOG.md
index a4ad8d5063..02656ce1ee 100644
--- a/addOns/webdrivers/webdriverlinux/CHANGELOG.md
+++ b/addOns/webdrivers/webdriverlinux/CHANGELOG.md
@@ -6,7 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Changed
- Update ChromeDriver to 131.0.6778.204.
-- Update minimum ZAP version to 2.16.0.
## [116] - 2024-12-04
### Changed
diff --git a/addOns/webdrivers/webdrivermacos/CHANGELOG.md b/addOns/webdrivers/webdrivermacos/CHANGELOG.md
index b34429dfe1..37065be236 100644
--- a/addOns/webdrivers/webdrivermacos/CHANGELOG.md
+++ b/addOns/webdrivers/webdrivermacos/CHANGELOG.md
@@ -6,7 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Changed
- Update ChromeDriver to 131.0.6778.204.
-- Update minimum ZAP version to 2.16.0.
## [116] - 2024-12-04
### Changed
diff --git a/addOns/webdrivers/webdrivers.gradle.kts b/addOns/webdrivers/webdrivers.gradle.kts
index ff75c2de86..3209db2b6d 100644
--- a/addOns/webdrivers/webdrivers.gradle.kts
+++ b/addOns/webdrivers/webdrivers.gradle.kts
@@ -80,6 +80,8 @@ subprojects {
sourceSets["main"].output.dir(mapOf("builtBy" to downloadTasks), webdriversDir)
zapAddOn {
+ zapVersion.set("2.15.0")
+
manifest {
files.from(webdriversDir)
}
diff --git a/addOns/webdrivers/webdriverwindows/CHANGELOG.md b/addOns/webdrivers/webdriverwindows/CHANGELOG.md
index e49e3c2613..fab7cdef55 100644
--- a/addOns/webdrivers/webdriverwindows/CHANGELOG.md
+++ b/addOns/webdrivers/webdriverwindows/CHANGELOG.md
@@ -6,7 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Changed
- Update ChromeDriver to 131.0.6778.204.
-- Update minimum ZAP version to 2.16.0.
## [116] - 2024-12-04
### Changed