This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from f4089cb6d Merge pull request #376 from arturobernalg/JSPWIKI-1204
new 5ab4d876a Move escapeHTMLEntities to TextUtil
new 5a9ac33f9 Move xstream version to parent pom
new a49b2fd5c Allow data: or javascript: uris on src attribute of Image
plugin only if jspwiki.translatorReader.allowHTML is enabled
new c21f6e164 Additional tests + small refactors
new 1af646697 Proper fix + use constant from MarkupParser
new 44d70e4a5 Allow text to be wrapped on a given tag
new bd790309b Update dependencies
new 184f18595 Update tomcat launcher binary files to 9.0.102
new 5b9dab428 Proper HTML escaping + introduce WikiHtmlInline to be able
to avoid HTML escaping performed by Flexmark
new 629ac8c96 2.12.3-git-05
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 25 ++++++--
LICENSE | 6 +-
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 65 +++------------------
.../main/java/org/apache/wiki/plugin/Image.java | 32 +++++-----
.../wiki/parser/JSPWikiMarkupParserTest.java | 23 ++++++--
.../java/org/apache/wiki/plugin/SamplePlugin.java | 13 ++++-
.../ImageLinkNodePostProcessorState.java | 7 +--
.../LocalLinkNodePostProcessorState.java | 11 ++--
.../NodePostProcessorStateCommonOperations.java | 11 +---
.../PluginLinkNodePostProcessorState.java | 15 +++--
.../VariableLinkNodePostProcessorState.java | 5 +-
.../jspwikilinks/postprocessor/WikiHtmlInline.java | 52 +++++++++++++++++
.../markdown/renderer/JSPWikiLinkRenderer.java | 13 ++++-
.../wiki/parser/markdown/MarkdownDocument.java | 5 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 36 +++++++++++-
jspwiki-portable/pom.xml | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35459 -> 35459 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49607 -> 52799 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3877951 -> 3892373
bytes
.../main/java/org/apache/wiki/util/TextUtil.java | 51 +++++++++++++++-
pom.xml | 19 +++---
22 files changed, 256 insertions(+), 137 deletions(-)
create mode 100644
jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/WikiHtmlInline.java
