This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.jdom-jdom2-2.0.6.1
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
discard 2a1f52a8e Bump jdom2 from 2.0.6 to 2.0.6.1
add 31a063321 TestEngine#shutdown() now cleans cache, wiki pages dir and
their associated attachments, if any
add 7535118e8 Explicit generic parameters on getPageInfo and
getPageInfoVersion
add f022e411f Clean up a handful of tests
add 68faee535 Update doclet version for JDK >= 9
add 0c5b903be Update dependencies
add a407a7116 update with latest updated versions
add 17b28348b 2.11.3-git-08
add 83bfb7f37 ensure engine clean up after tests' execution
add ce22e952b ensure engine clean up after tests' execution
add 18d294108 Fix annoying typos.
add 843e6ed73 Remove redundant member initializer.
add d3d54c88d * Use diamond type <>. * Remove unnecessary boxing. * Remove
unnecessary unboxing. * Replace 'String.indexOf()' expression with
'contains()'. * Replace 'for' loop with enhanced 'for' loop.
add 8f50025a4 Make final variable when is possible.
add 5ed57bd79 remove extra semicolon.
add a39e1a81a Upgrade Tika to 2.4.0
add 1617a34ab only build & destroy one Engine for all tests in class
add 0cbf45c78 Minor format edits
add 3d498669c Footnote links start with #ref-, instead of #
add 903be0fd8 format class
add 5bb7f9734 bom must have packaging == pom
add 7c1255e2e new jspwiki-http module
add f2d231ba1 fix integration tests setup
add ccaf74ad8 Session gets new antiCsrfToken method
add 45f22ecac fix IT check
add 84740147a format web.xml files
add 18bb41c56 Allow TestEngine to disable properties' cleaning through
jspwiki.test.disable-clean-props property
add 63f0617b8 Use Context instead of WikiContext
add 8365f5bee Add dependency on jspwiki-http module
add cdfb63d26 new wiki:CsrfProtection custom tag
add d42623bcc FormOpen generates csrf protection hidden input
add 1f1c94e77 Use new wiki:CsrfProtection tag on JSPs
add 25f3c707a Ensure AJAX requests send the csrf protection parameter
add 087f90afa JSPWiki to Markdown syntax conversion tool
add a55c6afd2 Add missing AL headers
add c4c5f411a Dependency updates
add 9dec27e23 Update Tomcat's binaries
add 5afdd0cdf Update versions
add b7cf446d8 Update mvn cheat sheet
add 69a48e16f 2.11.3-git-09
add ef8b6e39b add missing link to WikiSyntaxConverter
add 3bc4853e9 add apt update && apt upgrade before apt install
add 52274290c forgot to add -y on apt upgrade
add 1d9c4410d Bring CSRF protection to group management JSPs
add 0f0054d3e use log placeholders
add c25bf3f81 Dependency updates
add c9b544b9d Update LICENSE's versions
add fb705250c add default application name on <title> element to
templates' templates
add 9dbca5af0 Main as default frontpage if none is defined
add 7d6097994 2.11.3-git-10
add 3455b9818 Bump jdom2 from 2.0.6 to 2.0.6.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2a1f52a8e)
\
N -- N -- N refs/heads/dependabot/maven/org.jdom-jdom2-2.0.6.1
(3455b9818)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
ChangeLog.md | 54 +
Dockerfile | 2 +
LICENSE | 30 +-
.../test/java/com/example/filters/TwoXFilter.java | 2 +-
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../main/java/org/apache/wiki/api/core/Acl.java | 6 +-
.../java/org/apache/wiki/api/core/Command.java | 2 +-
.../java/org/apache/wiki/api/core/Session.java | 12 +-
.../exceptions/NoRequiredPropertyException.java | 2 +-
jspwiki-bom/pom.xml | 7 +
.../org/apache/wiki/event/WikiSecurityEvent.java | 4 +-
.../apache/wiki/event/TestWikiEventListener.java | 2 +-
{jspwiki-bootstrap => jspwiki-http}/pom.xml | 26 +-
.../wiki/http/filter/CsrfProtectionFilter.java | 74 +
.../src/main/resources/META-INF/web-fragment.xml | 30 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../apache/wiki/pages/haddock/ViewWikiPage.java | 2 +-
jspwiki-it-tests/pom.xml | 2 +
.../search/kendra/KendraSearchProviderTest.java | 2 +-
jspwiki-main/pom.xml | 6 +
.../src/main/java/org/apache/wiki/WikiSession.java | 9 +
.../wiki/auth/DefaultAuthorizationManager.java | 35 +-
.../org/apache/wiki/auth/SecurityVerifier.java | 7 +-
.../main/java/org/apache/wiki/auth/acl/Acl.java | 2 +-
.../java/org/apache/wiki/auth/acl/AclEntry.java | 2 +-
.../apache/wiki/auth/acl/UnresolvedPrincipal.java | 2 +-
.../java/org/apache/wiki/auth/authorize/Group.java | 2 +-
.../wiki/auth/authorize/JDBCGroupDatabase.java | 8 +-
.../apache/wiki/auth/authorize/WebAuthorizer.java | 2 +-
.../wiki/auth/permissions/PermissionChecks.java | 2 +-
.../wiki/auth/permissions/WikiPermission.java | 29 +-
.../org/apache/wiki/auth/user/UserDatabase.java | 2 +-
.../main/java/org/apache/wiki/forms/FormOpen.java | 8 +-
.../java/org/apache/wiki/pages/PageSorter.java | 2 +-
.../wiki/parser/CreoleToJSPWikiTranslator.java | 45 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 1629 +++++++-------------
.../java/org/apache/wiki/parser/LinkParser.java | 2 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 2 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 2 +-
.../org/apache/wiki/plugin/TableOfContents.java | 4 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 2 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 2 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 21 +-
.../org/apache/wiki/tags/CsrfProtectionTag.java | 53 +
.../java/org/apache/wiki/tags/InsertDiffTag.java | 2 +-
.../java/org/apache/wiki/tags/MessagesTag.java | 4 +-
.../main/java/org/apache/wiki/tags/ParamTag.java | 2 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 22 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 14 +-
.../org/apache/wiki/ui/admin/SimpleAdminBean.java | 22 +-
.../main/java/org/apache/wiki/workflow/Step.java | 2 +-
.../org/apache/wiki/workflow/SystemPrincipal.java | 2 +-
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 4 +-
.../src/main/resources/META-INF/jspwiki.tld | 9 +
.../src/test/java/org/apache/wiki/HsqlDbUtils.java | 4 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 37 +-
.../java/org/apache/wiki/TestJDBCDataSource.java | 10 +-
.../test/java/org/apache/wiki/TestJNDIContext.java | 4 +-
.../test/java/org/apache/wiki/WikiEngineTest.java | 14 +-
.../wiki/attachment/AttachmentManagerTest.java | 14 +-
.../org/apache/wiki/auth/SecurityEventTrap.java | 2 +-
.../wiki/auth/authorize/JDBCGroupDatabaseTest.java | 4 +-
.../wiki/auth/user/JDBCUserDatabaseTest.java | 2 +-
.../org/apache/wiki/content/PageRenamerTest.java | 18 -
.../apache/wiki/pages/DefaultPageManagerTest.java | 7 -
.../wiki/parser/JSPWikiMarkupParserTest.java | 13 +-
.../org/apache/wiki/plugin/JavaScriptPlugin.java | 2 +-
.../wiki/plugin/ReferringPagesPluginTest.java | 3 +-
.../java/org/apache/wiki/plugin/SamplePlugin.java | 2 +-
.../org/apache/wiki/plugin/WeblogPluginTest.java | 9 +-
.../providers/BasicAttachmentProviderTest.java | 38 +-
.../apache/wiki/providers/CachingProviderTest.java | 20 +-
.../org/apache/wiki/providers/CounterProvider.java | 10 +-
.../wiki/providers/VersioningFileProviderTest.java | 7 -
.../apache/wiki/providers/VerySimpleProvider.java | 2 +-
.../wiki/references/ReferenceManagerTest.java | 7 -
.../apache/wiki/render/RenderingManagerTest.java | 12 +-
.../org/apache/wiki/search/SearchManagerTest.java | 3 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 5 -
.../wiki/stress/StressTestVersioningProvider.java | 70 +-
.../wiki/tasks/pages/SaveWikiPageTaskTest.java | 18 +-
.../java/org/apache/wiki/web/TestContainer.java | 92 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 23 +-
.../markdown/migration/WikiSyntaxConverter.java | 74 +
.../migration/filters/TidyMarkupFilter.java | 24 +-
.../parser/JSPWikiToMarkdownMarkupParser.java | 81 +
.../wiki/render/markdown/MarkdownRendererTest.java | 5 -
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34699 -> 34699 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46897 -> 46898 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3659368 -> 3669432
bytes
.../org/apache/wiki/util/CommentedProperties.java | 7 +-
.../main/java/org/apache/wiki/util/CryptoUtil.java | 6 +-
.../main/java/org/apache/wiki/util/FormUtil.java | 2 +-
.../main/java/org/apache/wiki/util/MailUtil.java | 2 +-
.../java/org/apache/wiki/util/PriorityList.java | 4 +-
.../org/apache/wiki/util/TimedCounterList.java | 10 +-
.../wiki/util/comparators/HumanComparator.java | 10 +-
jspwiki-war/src/main/scripts/jspwiki-common.js | 4 +-
jspwiki-war/src/main/scripts/jspwiki-edit.js | 2 +-
.../src/main/scripts/wiki-edit/Wiki.Edit.js | 3 +-
jspwiki-war/src/main/scripts/wiki/Category.js | 5 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 5 +-
jspwiki-war/src/main/styles/jspwiki_print.css | 2 +-
jspwiki-war/src/main/webapp/Captcha.jsp | 3 +-
jspwiki-war/src/main/webapp/DeleteGroup.jsp | 6 +
jspwiki-war/src/main/webapp/EditGroup.jsp | 15 +-
jspwiki-war/src/main/webapp/Error.jsp | 2 +-
jspwiki-war/src/main/webapp/Install.jsp | 2 +-
jspwiki-war/src/main/webapp/NewGroup.jsp | 5 +
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 24 +-
jspwiki-war/src/main/webapp/admin/Admin.jsp | 2 +-
.../src/main/webapp/admin/SecurityConfig.jsp | 4 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 13 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 1 +
.../main/webapp/templates/210/EditGroupContent.jsp | 3 +-
.../src/main/webapp/templates/210/EditTemplate.jsp | 4 +-
.../src/main/webapp/templates/210/FindContent.jsp | 2 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 1 +
.../src/main/webapp/templates/210/GroupTab.jsp | 1 +
.../src/main/webapp/templates/210/InfoContent.jsp | 5 +-
.../src/main/webapp/templates/210/LoginContent.jsp | 4 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 2 +-
.../src/main/webapp/templates/210/PageTab.jsp | 1 +
.../main/webapp/templates/210/PreferencesTab.jsp | 2 +
.../src/main/webapp/templates/210/ProfileTab.jsp | 1 +
.../src/main/webapp/templates/210/SearchBox.jsp | 1 +
.../main/webapp/templates/210/UploadTemplate.jsp | 2 +-
.../src/main/webapp/templates/210/ViewTemplate.jsp | 2 +-
.../main/webapp/templates/210/WorkflowContent.jsp | 2 +
.../webapp/templates/210/admin/AdminTemplate.jsp | 2 +
.../webapp/templates/210/admin/UserManagement.jsp | 1 +
.../src/main/webapp/templates/210/commonheader.jsp | 1 +
.../main/webapp/templates/210/editors/CKeditor.jsp | 3 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 1 +
.../main/webapp/templates/210/editors/TinyMCE.jsp | 1 +
.../main/webapp/templates/210/editors/plain.jsp | 1 +
.../main/webapp/templates/210/editors/preview.jsp | 1 +
.../main/webapp/templates/210/editors/wysiwyg.jsp | 1 +
.../webapp/templates/default/AttachmentTab.jsp | 5 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 1 +
.../webapp/templates/default/EditGroupContent.jsp | 1 +
.../main/webapp/templates/default/EditTemplate.jsp | 4 +-
.../main/webapp/templates/default/FindContent.jsp | 1 +
.../src/main/webapp/templates/default/GroupTab.jsp | 2 +
.../src/main/webapp/templates/default/Header.jsp | 2 +-
.../main/webapp/templates/default/InfoContent.jsp | 5 +-
.../main/webapp/templates/default/LoginContent.jsp | 4 +-
.../src/main/webapp/templates/default/PageTab.jsp | 1 +
.../webapp/templates/default/PreferencesTab.jsp | 1 +
.../main/webapp/templates/default/ProfileTab.jsp | 1 +
.../main/webapp/templates/default/SearchBox.jsp | 1 +
.../webapp/templates/default/UploadTemplate.jsp | 2 +-
.../src/main/webapp/templates/default/UserBox.jsp | 10 +-
.../main/webapp/templates/default/ViewTemplate.jsp | 2 +-
.../webapp/templates/default/WorkflowContent.jsp | 2 +
.../templates/default/admin/AdminTemplate.jsp | 2 +
.../templates/default/admin/UserManagement.jsp | 3 +-
.../main/webapp/templates/default/commonheader.jsp | 1 +
.../webapp/templates/default/editors/CKeditor.jsp | 1 +
.../webapp/templates/default/editors/TinyMCE.jsp | 1 +
.../webapp/templates/default/editors/plain.jsp | 1 +
.../webapp/templates/default/editors/preview.jsp | 2 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 1 +
.../main/webapp/templates/reader/ViewTemplate.jsp | 2 +-
.../apache/wiki/htmltowiki/SyntaxDecorator.java | 2 +-
.../wiki/htmltowiki/syntax/MarkupHelper.java | 2 +-
mvn_cheat-sheet.md | 2 +-
pom.xml | 33 +-
172 files changed, 1543 insertions(+), 1889 deletions(-)
copy {jspwiki-bootstrap => jspwiki-http}/pom.xml (89%)
create mode 100644
jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
copy jspwiki-api/src/main/java/org/apache/wiki/api/core/package.html =>
jspwiki-http/src/main/resources/META-INF/web-fragment.xml (56%)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java
create mode 100644
jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
copy jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java =>
jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/filters/TidyMarkupFilter.java
(63%)
create mode 100644
jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/parser/JSPWikiToMarkdownMarkupParser.java
