Hi,
I wanted to push a single update (XSS vuln.) to the repo this morning, but
it seems that other (local) changes were merged as well :-(
I've no time to further check this now; but will validate this evening.
Sorry for the inconvenience,
dirk
On Wed, Jan 12, 2022 at 8:10 AM <[email protected]> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> brushed pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/jspwiki.git
>
> commit 6e5da6210062e8db785163ad5c77c5512b952ccf
> Merge: de8e6bb 8d9660b
> Author: brushed <[email protected]>
> AuthorDate: Wed Jan 12 08:05:35 2022 +0100
>
> Merge branch 'master' of https://github.com/apache/jspwiki
>
> ChangeLog.md | 29 ++-
> LICENSE | 1 +
> .../src/main/java/org/apache/wiki/api/Release.java | 6 +-
> jspwiki-bom/pom.xml | 222
> +++++++++++++++++++++
> .../WikiBootstrapServletContextListenerTest.java | 2 +-
> .../src/test/resources/ini/jspwiki.properties | 19 +-
> .../htmltowiki/HtmlStringToWikiTranslator.java | 2 +
> .../apache/wiki/htmltowiki/SyntaxDecorator.java | 19 +-
> .../htmltowiki/XHtmlElementToWikiTranslator.java | 30 ++-
> .../wiki/htmltowiki/syntax/MarkupHelper.java | 111 +++++++++++
> .../wiki/htmltowiki/syntax/jspwiki/ADecorator.java | 136 +++----------
> .../htmltowiki/syntax/jspwiki/HrDecorator.java | 1 +
> .../htmltowiki/syntax/jspwiki/ImageDecorator.java | 1 +
> .../syntax/jspwiki/JSPWikiSyntaxDecorator.java | 16 +-
> .../htmltowiki/syntax/jspwiki/MarkupHelper.java | 35 ----
> .../syntax/jspwiki/PlainTextCssDecorator.java | 9 +-
> .../jspwiki/PlainTextCssSpecialDecorator.java | 5 +-
> .../syntax/jspwiki/PlainTextDecorator.java | 2 +-
> .../wiki/references/DefaultReferenceManager.java | 57 +++---
> .../src/main/resources/ini/jspwiki.properties | 17 ++
> jspwiki-markdown/pom.xml | 5 +
> .../wiki/parser/markdown/MarkdownDocument.java | 3 +
> .../main/java/org/apache/wiki/util/XmlUtil.java | 19 +-
> pom.xml | 17 +-
> 24 files changed, 554 insertions(+), 210 deletions(-)
>
