This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from 177046347 Merge pull request #370 from weberjn/jakarta
add bd412b29b JSPWIKI-1197 fix for if and when someone, other software
(antivirus, etc) or a human deletes an attachment from disk and leaves behind a
properties file in the attachment director for a given wiki page. Before this
change jspwiki would not boot up in this condition. After it will and simply
logs this error condition.
add 76669e391 formatting
add 101f7c28c Update dependencies
add 5ad653676 2.12.3-git-03
add a184e0a53 Update portable build binaries
add 402f9a18b [SECURITY][XBOW-024-109] Fix XSS vulnerability in header
link rendering
add f4089cb6d Merge pull request #376 from arturobernalg/JSPWIKI-1204
add 5ab4d876a Move escapeHTMLEntities to TextUtil
add 5a9ac33f9 Move xstream version to parent pom
add a49b2fd5c Allow data: or javascript: uris on src attribute of Image
plugin only if jspwiki.translatorReader.allowHTML is enabled
add c21f6e164 Additional tests + small refactors
add 1af646697 Proper fix + use constant from MarkupParser
add 44d70e4a5 Allow text to be wrapped on a given tag
add bd790309b Update dependencies
add 184f18595 Update tomcat launcher binary files to 9.0.102
add 5b9dab428 Proper HTML escaping + introduce WikiHtmlInline to be able
to avoid HTML escaping performed by Flexmark
add 629ac8c96 2.12.3-git-05
add 777d5e472 Normalize user input in registration
add 814459402 Polish tests
add 40f59e632 Proper digest comparison on CryptoUtil.verifySaltedPassword
add 77608854a Update dependencies, closes #373, closes #375
add f7d8573f5 2.12.3-git-06
new faf66b896 Merge branch 'master' into jakarta
The 1 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 | 58 ++++++++++++
LICENSE | 45 +++++-----
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 6 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 71 +++------------
.../main/java/org/apache/wiki/plugin/Image.java | 32 +++----
.../wiki/providers/BasicAttachmentProvider.java | 13 +--
.../apache/wiki/auth/DefaultUserManagerTest.java | 76 ++++++++++++++++
.../wiki/parser/JSPWikiMarkupParserTest.java | 53 +++++++++--
.../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 | 6 +-
.../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 49610 -> 52799 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3831321 -> 3892373
bytes
.../main/java/org/apache/wiki/util/CryptoUtil.java | 97 ++++++++-------------
.../main/java/org/apache/wiki/util/TextUtil.java | 51 ++++++++++-
.../java/org/apache/wiki/util/CryptoUtilTest.java | 3 +-
pom.xml | 39 +++++----
27 files changed, 482 insertions(+), 235 deletions(-)
create mode 100644
jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java
create mode 100644
jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/WikiHtmlInline.java
