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
omit 3455b9818 Bump jdom2 from 2.0.6 to 2.0.6.1
add aad6dcb7a move csrf check to save action
add 431e44333 fix list indentation
add a55edaea6 WikiSyntaxConverter.java now also brings pages' attachments
when converting to markdown
add 5b63ca278 Update ChangeLog
add 9d45ae972 Remove unnecessary/redundant import statements.
add 0619de2fc Simplify arithmetic expressions.
add da2ab2a5d Use uppercase LOG class constant.
add f1f582dd7 update maven-project-info-reports-plugin to 3.4.0 - closes
#208
add 70eeaba88 Bring explicit CSRF protection to user management JSPs
add 300d60273 2.11.3-git-11
add 55b117915 add missing csrf params
add 1f1a47440 Missing @override.
add 72b38fe29 Declare 'private static final long' 'serialVersionUID' field.
add 6dac6a3fb Update ChangeLog
add 5f66a7abd Update portable launcher binaries and update launch4j
download urls
add b636b50f0 Update dependencies
add 94d658571 2.11.3-git-12
add 8b891d5a6 Update JUnit to 5.9.0, HSQLDB to 2.7.0 - closes #217, closes
#218, thanks to dependabot
add f6f255834 prepare for 2.11.3
add 515dff39c [maven-release-plugin] prepare release 2.11.3-RC1
add 4b196bfb7 [maven-release-plugin] prepare for next development iteration
add 278f17c5e set build version to 2.12.0-SNAPSHOT
add 4aa268cd5 require JDK-11, drop JDK-8 build, tentatively build with
jdk-19
add 7ac34ca75 Update dependencies
add 6867c8802 Update Lucene to 9.4.0
add f361900d2 Update portable build binaries
add 875b70a71 2.12.0-git-01
add 191d4bfa6 Update Mockito to 4.8.1 - closes #225
add 3f25506f4 Add missing licences.
add fabcbd750 fix sublist indenting
add 663347128 Build on Dockerfile using JDK-11
add 82be08904 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add 484c6a133 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add 9d6dbf911 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add 46e1ef7a5 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add df20770f2 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add 0b9a01490 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add 75019d337 XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add 2ce696aeb XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
add f40709094 Update portable build jars
add b67f90af9 remove oudated info
add 50752e8c2 Add some colors to jenkins' console builds
add 9bc32a67c Ensure EhCache is clean on first test execution
add a5c0aacc8 Update dependencies
add 402375b9c 2.12.0-git-03
add 87b379c54 fix css used by Install.jsp
add 8ded0082e fix typo
add 0e5ef51b4 .html, .htm and .js attachments are now forcibly downloaded
by default
add 033e1bb2d rephrase property desc + fix typo
add 416855bf5 Attempt to make the auto-generated github emails more easily
readable in email clients
add b4eef964a ReferenceManager implement via jspwiki.refation can be
setManager property[-custom].proper on your jspwikities file
add 32756d77d * Dependency updates
add 3c0fe8d2b update portable build binaries
add a9cd10929 2.12.0-git-04
add 85071331c Use isEmpty(). Expresses the intent more clearly
add 7ae1b1d49 Avoid use File Stream. The FileInputStream and
FileOutputStream classes contains a finalizer method which will cause garbage
collection pauses.
add 864e5970e Prefer java.lang.String.getBytes(java.nio.charset.Charset)
add 78dd01566 fix PR link
add 4381550a0 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 (3455b9818)
\
N -- N -- N refs/heads/dependabot/maven/org.jdom-jdom2-2.0.6.1
(4381550a0)
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:
.asf.yaml | 21 +-
ChangeLog.md | 108 +-
Dockerfile | 2 +-
Jenkinsfile | 65 +-
LICENSE | 80 +-
README.md | 4 +-
UPGRADING | 12 +-
docker-files/tomcat-users.xml | 18 +
jspwiki-210-adapters/pom.xml | 2 +-
.../apache/wiki/api/filters/BasicPageFilter.java | 15 +-
jspwiki-210-test-adaptees/pom.xml | 2 +-
jspwiki-api/pom.xml | 2 +-
.../src/main/java/org/apache/wiki/api/Release.java | 6 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 3 +
.../engine/EngineLifecycleExtensionTestImpl.java | 9 +-
.../src/test/resources/ini/jspwiki.properties | 17 +
jspwiki-bom/pom.xml | 4 +-
jspwiki-bootstrap/pom.xml | 2 +-
.../src/test/resources/ini/jspwiki.properties | 17 +
jspwiki-cache/pom.xml | 2 +-
jspwiki-event/pom.xml | 2 +-
.../org/apache/wiki/event/WikiEventManager.java | 6 +-
.../org/apache/wiki/event/WikiPageRenameEvent.java | 2 +
jspwiki-http/pom.xml | 2 +-
.../wiki/http/filter/CsrfProtectionFilter.java | 18 +
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
.../jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
.../jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +-
.../apache/wiki/its/WithIntegrationTestSetup.java | 18 +
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-kendra-searchprovider/pom.xml | 2 +-
.../src/test/resources/log4j.properties | 17 +
jspwiki-main/pom.xml | 4 +-
.../main/java/org/apache/wiki/LinkCollector.java | 3 +-
.../src/main/java/org/apache/wiki/WatchDog.java | 22 +-
.../java/org/apache/wiki/WikiBackgroundThread.java | 2 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 6 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 4 +-
.../src/main/java/org/apache/wiki/WikiPage.java | 4 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 8 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 8 +-
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 14 +-
.../org/apache/wiki/attachment/Attachment.java | 9 +-
.../apache/wiki/attachment/AttachmentServlet.java | 42 +-
.../wiki/auth/DefaultAuthenticationManager.java | 16 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 18 +-
.../java/org/apache/wiki/auth/GroupPrincipal.java | 1 +
.../java/org/apache/wiki/auth/SessionMonitor.java | 10 +-
.../org/apache/wiki/auth/acl/AclEntryImpl.java | 14 +-
.../apache/wiki/auth/acl/DefaultAclManager.java | 12 +-
.../apache/wiki/auth/acl/UnresolvedPrincipal.java | 1 +
.../wiki/auth/authorize/DefaultGroupManager.java | 16 +-
.../wiki/auth/authorize/JDBCGroupDatabase.java | 14 +-
.../java/org/apache/wiki/auth/authorize/Role.java | 1 +
.../auth/authorize/WebContainerAuthorizer.java | 24 +-
.../wiki/auth/authorize/XMLGroupDatabase.java | 36 +-
.../wiki/auth/login/AbstractLoginModule.java | 13 +-
.../wiki/auth/login/AnonymousLoginModule.java | 9 +-
.../auth/login/CookieAssertionLoginModule.java | 11 +-
.../login/CookieAuthenticationLoginModule.java | 26 +-
.../apache/wiki/auth/login/PrincipalWrapper.java | 1 +
.../wiki/auth/login/UserDatabaseLoginModule.java | 9 +-
.../wiki/auth/login/WebContainerLoginModule.java | 13 +-
.../wiki/auth/permissions/AllPermission.java | 5 +-
.../auth/permissions/AllPermissionCollection.java | 5 +-
.../wiki/auth/permissions/GroupPermission.java | 2 +
.../wiki/auth/permissions/PagePermission.java | 4 +-
.../wiki/auth/permissions/WikiPermission.java | 3 +
.../wiki/auth/user/AbstractUserDatabase.java | 10 +-
.../apache/wiki/auth/user/JDBCUserDatabase.java | 14 +-
.../org/apache/wiki/auth/user/XMLUserDatabase.java | 42 +-
.../apache/wiki/content/DefaultPageRenamer.java | 6 +-
.../apache/wiki/diff/ContextualDiffProvider.java | 6 +-
.../apache/wiki/diff/DefaultDifferenceManager.java | 10 +-
.../org/apache/wiki/diff/ExternalDiffProvider.java | 6 +-
.../apache/wiki/diff/TraditionalDiffProvider.java | 4 +-
.../java/org/apache/wiki/filters/CreoleFilter.java | 6 +-
.../apache/wiki/filters/DefaultFilterManager.java | 24 +-
.../apache/wiki/filters/PingWeblogsComFilter.java | 12 +-
.../org/apache/wiki/filters/ProfanityFilter.java | 6 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 68 +-
.../main/java/org/apache/wiki/forms/FormOpen.java | 13 +-
.../java/org/apache/wiki/forms/FormOutput.java | 17 +-
.../org/apache/wiki/modules/ModuleManager.java | 18 +
.../org/apache/wiki/pages/PageTimeComparator.java | 11 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 30 +-
.../java/org/apache/wiki/parser/LinkParser.java | 8 +-
.../apache/wiki/parser/LinkParsingOperations.java | 6 +-
.../java/org/apache/wiki/parser/MarkupParser.java | 4 +-
.../java/org/apache/wiki/parser/PluginContent.java | 12 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 10 +-
.../org/apache/wiki/plugin/BugReportHandler.java | 11 +-
.../org/apache/wiki/plugin/CurrentTimePlugin.java | 10 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 22 +-
.../main/java/org/apache/wiki/plugin/Denounce.java | 18 +-
.../java/org/apache/wiki/plugin/IndexPlugin.java | 4 +-
.../java/org/apache/wiki/plugin/InsertPage.java | 6 +-
.../org/apache/wiki/plugin/PageViewPlugin.java | 22 +-
.../apache/wiki/plugin/RecentChangesPlugin.java | 4 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 4 +-
.../apache/wiki/plugin/ReferringPagesPlugin.java | 4 +-
.../main/java/org/apache/wiki/plugin/Search.java | 7 +-
.../org/apache/wiki/plugin/TableOfContents.java | 8 +-
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 4 +-
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 4 +-
.../org/apache/wiki/preferences/Preferences.java | 12 +-
.../wiki/providers/AbstractFileProvider.java | 22 +-
.../wiki/providers/BasicAttachmentProvider.java | 22 +-
.../apache/wiki/providers/FileSystemProvider.java | 6 +-
.../wiki/providers/VersioningFileProvider.java | 22 +-
.../wiki/references/DefaultReferenceManager.java | 2 +-
.../org/apache/wiki/render/CleanTextRenderer.java | 1 +
.../org/apache/wiki/render/CreoleRenderer.java | 1 +
.../wiki/render/CustomXMLOutputProcessor.java | 3 +-
.../apache/wiki/render/WysiwygEditingRenderer.java | 1 +
.../java/org/apache/wiki/render/XHTMLRenderer.java | 1 +
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 24 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 2 +-
.../org/apache/wiki/rss/DefaultRSSGenerator.java | 4 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 2 +-
.../main/java/org/apache/wiki/rss/RSSThread.java | 10 +-
.../apache/wiki/search/BasicSearchProvider.java | 20 +-
.../apache/wiki/search/DefaultSearchManager.java | 30 +-
.../apache/wiki/search/LuceneSearchProvider.java | 61 +-
.../java/org/apache/wiki/search/SearchResult.java | 1 +
.../apache/wiki/search/SearchResultComparator.java | 3 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 8 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 4 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 4 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 6 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 10 +-
.../org/apache/wiki/tags/EditorIteratorInfo.java | 1 +
.../main/java/org/apache/wiki/tags/EditorTag.java | 4 +-
.../org/apache/wiki/tags/HasAttachmentsTag.java | 4 +-
.../org/apache/wiki/tags/HistoryIteratorInfo.java | 3 +-
.../org/apache/wiki/tags/IfNoSearchResultsTag.java | 1 +
.../org/apache/wiki/tags/IncludeResourcesTag.java | 2 +
.../main/java/org/apache/wiki/tags/IncludeTag.java | 6 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 4 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 4 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 6 +-
.../java/org/apache/wiki/tags/LinkToParentTag.java | 1 +
.../java/org/apache/wiki/tags/NextVersionTag.java | 1 +
.../java/org/apache/wiki/tags/PageDateTag.java | 2 +
.../java/org/apache/wiki/tags/PageExistsTag.java | 1 +
.../java/org/apache/wiki/tags/PageSizeTag.java | 4 +-
.../java/org/apache/wiki/tags/PageTypeTag.java | 2 +
.../java/org/apache/wiki/tags/PageVersionTag.java | 1 +
.../main/java/org/apache/wiki/tags/PluginTag.java | 6 +-
.../apache/wiki/tags/SearchResultIteratorInfo.java | 3 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 4 +-
.../org/apache/wiki/tags/SearchResultsSizeTag.java | 1 +
.../org/apache/wiki/tags/SearchResultsTag.java | 1 +
.../org/apache/wiki/tags/SetPaginationTag.java | 2 +
.../src/main/java/org/apache/wiki/tags/TabTag.java | 3 +
.../java/org/apache/wiki/tags/TemplateDirTag.java | 1 +
.../java/org/apache/wiki/tags/TranslateTag.java | 4 +-
.../java/org/apache/wiki/tags/WikiBodyTag.java | 9 +-
.../java/org/apache/wiki/tags/WikiLinkTag.java | 4 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 8 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 18 +
.../java/org/apache/wiki/ui/AbstractCommand.java | 9 +-
.../org/apache/wiki/ui/DefaultEditorManager.java | 8 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 14 +-
.../main/java/org/apache/wiki/ui/GroupCommand.java | 5 +-
.../main/java/org/apache/wiki/ui/PageCommand.java | 5 +-
.../java/org/apache/wiki/ui/RedirectCommand.java | 5 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 10 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 4 +-
.../wiki/ui/admin/DefaultAdminBeanManager.java | 32 +-
.../wiki/ui/progress/DefaultProgressManager.java | 27 +-
.../org/apache/wiki/url/ShortURLConstructor.java | 4 +-
.../wiki/variables/DefaultVariableManager.java | 6 +-
.../org/apache/wiki/workflow/AbstractStep.java | 25 +-
.../java/org/apache/wiki/workflow/Decision.java | 4 +-
.../apache/wiki/workflow/SimpleNotification.java | 1 +
.../org/apache/wiki/workflow/SystemPrincipal.java | 1 +
.../main/java/org/apache/wiki/workflow/Task.java | 1 +
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 20 +-
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 10 +-
.../src/main/javascript/Wiki.Snips.JSPWiki.js | 2 +-
.../src/main/resources/ini/jspwiki.properties | 14 +-
jspwiki-main/src/test/java/SamplePlugin2.java | 3 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 6 +-
.../org/apache/wiki/auth/SecurityEventTrap.java | 1 +
.../java/org/apache/wiki/pages/PageLockTest.java | 18 +
.../java/org/apache/wiki/plugin/SamplePlugin3.java | 3 +-
.../org/apache/wiki/plugin/WeblogPluginTest.java | 18 +
.../apache/wiki/providers/CachingProviderTest.java | 7 +
.../java/org/apache/wiki/web/TestContainer.java | 39 +-
.../java/org/apache/wiki/workflow/TaskTest.java | 6 +-
jspwiki-markdown/pom.xml | 2 +-
.../LocalFootnoteLinkNodePostProcessorState.java | 18 +
.../src/main/javascript/Wiki.Snips.Markdown.js | 2 +-
.../markdown/migration/WikiSyntaxConverter.java | 9 +
jspwiki-portable/build.xml | 8 +-
jspwiki-portable/pom.xml | 4 +-
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34699 -> 35213 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46898 -> 48971 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3669432 -> 3682537
bytes
jspwiki-tika-searchprovider/pom.xml | 2 +-
jspwiki-util/pom.xml | 2 +-
.../main/java/org/apache/wiki/util/ClassUtil.java | 28 +-
.../org/apache/wiki/util/CommentedProperties.java | 3 +-
.../main/java/org/apache/wiki/util/CryptoUtil.java | 2 +-
.../main/java/org/apache/wiki/util/FileUtil.java | 6 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 4 +-
.../main/java/org/apache/wiki/util/MailUtil.java | 23 +-
.../java/org/apache/wiki/util/PriorityList.java | 3 +
.../java/org/apache/wiki/util/PropertyReader.java | 7 +-
.../wiki/util/comparators/CollatorComparator.java | 1 +
.../wiki/util/comparators/HumanComparator.java | 1 +
.../util/comparators/JavaNaturalComparator.java | 1 +
.../java/org/apache/wiki/util/CryptoUtilTest.java | 2 +-
jspwiki-war/.eslintrc | 59 +
jspwiki-war/gulpfile.js | 199 +
jspwiki-war/package-lock.json | 4989 ++++++++++++++++++++
jspwiki-war/package.json | 23 +
jspwiki-war/pom.xml | 2 +-
.../util/extend-array.js} | 23 +-
jspwiki-war/src/main/scripts/util/extend-event.js | 68 +
jspwiki-war/src/main/scripts/util/extend-form.js | 85 +
.../util/extend-number.js} | 18 +-
jspwiki-war/src/main/scripts/util/extend.js | 83 +
jspwiki-war/src/main/webapp/Install.jsp | 6 +-
jspwiki-war/src/main/webapp/Login.jsp | 8 +-
jspwiki-war/src/main/webapp/NewGroup.jsp | 8 +-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 12 +-
.../src/main/webapp/favicons/browserconfig.xml | 18 +
.../src/main/webapp/favicons/site.webmanifest | 18 +
.../src/main/webapp/templates/default/Header.jsp | 4 +-
jspwiki-wikipages/de/pom.xml | 2 +-
jspwiki-wikipages/en/pom.xml | 2 +-
jspwiki-wikipages/es/pom.xml | 2 +-
jspwiki-wikipages/fi/pom.xml | 2 +-
jspwiki-wikipages/fr/pom.xml | 2 +-
jspwiki-wikipages/it/pom.xml | 2 +-
jspwiki-wikipages/nl/pom.xml | 2 +-
jspwiki-wikipages/pom.xml | 2 +-
jspwiki-wikipages/pt_BR/pom.xml | 2 +-
jspwiki-wikipages/ru/pom.xml | 2 +-
jspwiki-wikipages/zh_CN/pom.xml | 2 +-
jspwiki-wysiwyg/pom.xml | 2 +-
mvn_cheat-sheet.md | 3 +-
pom.xml | 103 +-
250 files changed, 7000 insertions(+), 921 deletions(-)
create mode 100644 jspwiki-war/.eslintrc
create mode 100644 jspwiki-war/gulpfile.js
create mode 100644 jspwiki-war/package-lock.json
create mode 100644 jspwiki-war/package.json
copy jspwiki-war/src/main/{styles/haddock/default/Template.Workflow.less =>
scripts/util/extend-array.js} (77%)
create mode 100644 jspwiki-war/src/main/scripts/util/extend-event.js
create mode 100644 jspwiki-war/src/main/scripts/util/extend-form.js
copy jspwiki-war/src/main/{styles/haddock/default/Template.Preview.less =>
scripts/util/extend-number.js} (75%)
create mode 100644 jspwiki-war/src/main/scripts/util/extend.js
