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 d7e57a3 2.11.3-git-03 / xss protection
new cc59143 JSPWIKI-802: move Wiki.Snips.js to modules with specific wiki
syntaxes
new c1c6955 TemplateManager now understands resources beginning with
'engine://' as keys of Engine's wiki properties
new 93fb684 JSPWIKI-802: load specific wiki syntax Wiki.Snips file, and
then Wiki.Edit.js after it
new f3a75eb fix typos
new 0a0b1b8 fix sonar issue
new 00e65d9 update xstream version to 1.4.19 - closes #177
new f960c13 JSPWIKI-802: load Markdown's syntax Wiki.Snips file
new e6a85dc update test + fix sonar issue
new 4a52372 Explicit wiki syntax / rendering properties + fix some typos
new ab2155b refactor working directory checks to separate methods, fixing
a couple of sonarqube issues
new d0e0d18 Update dependencies
new 47aebdb Update plugin dependencies
new d331efa Update libraries' versions
new 8de2acb Update tomcat portable binaries
new 2c59187 2.11.3-git-04
The 15 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 | 19 +++
LICENSE | 32 ++---
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../api/engine/EngineLifecycleExtensionTest.java | 2 +-
jspwiki-main/pom.xml | 19 +++
.../src/main/java/org/apache/wiki/WikiEngine.java | 64 +++++-----
.../java/org/apache/wiki/render/XHTMLRenderer.java | 2 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 26 ++--
.../src/main/javascript/Wiki.Snips.JSPWiki.js | 8 +-
.../src/main/javascript}/wro.properties | 6 +-
.../src/main/javascript/wro.xml | 10 +-
.../src/main/resources/ini/jspwiki.properties | 27 ++++-
.../test/java/org/apache/wiki/WikiEngineTest.java | 59 ++++-----
.../org/apache/wiki/ui/TemplateManagerTest.java | 75 ++++++++++++
jspwiki-markdown/pom.xml | 23 ++++
.../MarkdownSetupEngineLifecycleExtension.java | 1 +
.../src/main/javascript/Wiki.Snips.Markdown.js | 134 ++++++++++-----------
.../src/main/javascript}/wro.properties | 6 +-
.../src/main/javascript/wro.xml | 10 +-
.../MarkdownSetupEngineLifecycleExtensionTest.java | 4 +-
jspwiki-portable/pom.xml | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34698 -> 34699 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46898 -> 46895 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3656529 -> 3656699
bytes
jspwiki-war/src/main/config/wro/wro-haddock.xml | 5 +-
.../src/main/scripts/wiki-edit/Wiki.Edit.js | 2 +-
.../webapp/templates/default/editors/plain.jsp | 2 +
pom.xml | 10 +-
28 files changed, 360 insertions(+), 190 deletions(-)
copy jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js =>
jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js (99%)
copy {jspwiki-war/src/main/config/wro =>
jspwiki-main/src/main/javascript}/wro.properties (81%)
copy
jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/groupdatabase.xml =>
jspwiki-main/src/main/javascript/wro.xml (78%)
create mode 100644
jspwiki-main/src/test/java/org/apache/wiki/ui/TemplateManagerTest.java
rename jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js =>
jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js (83%)
copy {jspwiki-war/src/main/config/wro =>
jspwiki-markdown/src/main/javascript}/wro.properties (81%)
copy
jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/groupdatabase.xml =>
jspwiki-markdown/src/main/javascript/wro.xml (77%)