Skip to content

Commit e5885e4

Browse files
ricekotricekot
authored
Merge pull request #396 from thc202/rel-notes
Add release notes for 2.11.1 and prepare release
2 parents 5c91fcb + 8d041e3 commit e5885e4

File tree

6 files changed

+39
-1
lines changed

6 files changed

+39
-1
lines changed

‎addOns/help/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ All notable changes to this add-on will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

6+
## [13] - 2021-12-10
7+
### Changed
8+
- Updated for 2.11.1.
9+
610
## [12] - 2021-10-06
711
### Changed
812
- Updated for 2.11.0.
@@ -50,6 +54,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
5054

5155
- First version.
5256

57+
[13]: https://github.com/zaproxy/zap-core-help/releases/help-v13
5358
[12]: https://github.com/zaproxy/zap-core-help/releases/help-v12
5459
[11]: https://github.com/zaproxy/zap-core-help/releases/help-v11
5560
[10]: https://github.com/zaproxy/zap-core-help/releases/help-v10

‎addOns/help/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=12
1+
version=13
22
release=true

‎addOns/help/src/main/javahelp/contents/releases/2.11.1.html

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
2+
<HTML>
3+
<HEAD>
4+
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
5+
<TITLE>
6+
Release 2.11.1
7+
</TITLE>
8+
</HEAD>
9+
<BODY>
10+
<H1>Release 2.11.1</H1>
11+
<p>
12+
This release includes an important security fix - users are urged to upgrade asap.
13+
For more details refer to the blog post <a href="https://www.zaproxy.org/blog/2021-12-10-zap-and-log4shell/">ZAP and Log4Shell</a>.
14+
</p>
15+
<H2>Changes in Bundled Libraries</H2>
16+
The following library was updated:
17+
18+
<ul>
19+
<li>Log4j 2, 2.14.1 → 2.15.0</li>
20+
</ul>
21+
22+
23+
<H2>See also</H2>
24+
<table>
25+
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="../intro.html">Introduction</a></td><td>the introduction to ZAP</td></tr>
26+
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="releases.html">Releases</a></td><td>the full set of releases</td></tr>
27+
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="../credits.html">Credits</a></td><td>the people and groups who have made this release possible</td></tr>
28+
</table>
29+
</BODY>
30+
</HTML>

‎addOns/help/src/main/javahelp/contents/releases/releases.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ <H1>Releases</H1>
1111
<p>
1212
The following releases have been made:
1313
<table>
14+
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="2.11.1.html">2.11.1</a></td><td>includes an important security fix - users are urged to upgrade asap</td></tr>
1415
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="2.11.0.html">2.11.0</a></td><td>OWASP 20th anniversary bug fix and enhancement release</td></tr>
1516
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="2.10.0.html">2.10.0</a></td><td>10 year anniversary bug fix and enhancement release</td></tr>
1617
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="2.9.0.html">2.9.0</a></td><td>bug fix and enhancement release</td></tr>

‎addOns/help/src/main/javahelp/index.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<indexitem text="release 2.9.0" target="zap.releases.2.9.0" />
8585
<indexitem text="release 2.10.0" target="zap.releases.2.10.0" />
8686
<indexitem text="release 2.11.0" target="zap.releases.2.11.0" />
87+
<indexitem text="release 2.11.1" target="zap.releases.2.11.1" />
8788
<indexitem text="releases" target="zap.releases" />
8889
<indexitem text="request tab" target="ui.tabs.request" />
8990
<indexitem text="response tab" target="ui.tabs.response" />

‎addOns/help/src/main/javahelp/toc.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<tocitem text="Add-ons" target="addons.introduction" tocid="addons" image="addons.icon" />
131131

132132
<tocitem text="Releases" target="zap.releases">
133+
<tocitem text="2.11.1" target="zap.releases.2.11.1"/>
133134
<tocitem text="2.11.0" target="zap.releases.2.11.0"/>
134135
<tocitem text="2.10.0" target="zap.releases.2.10.0"/>
135136
<tocitem text="2.9.0" target="zap.releases.2.9.0"/>

0 commit comments

Comments
 (0)