You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2025/09/27 21:18:13 UTC
(jspwiki) 01/20: javax to jakarta
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 456025f66cd140fe59bf941cfe441117f3b71be9
Author: Jürgen Weber <we...@gmail.com>
AuthorDate: Fri Sep 6 15:55:47 2024 +0200
javax to jakarta
---
.gitignore | 24 +--
jspwiki-210-adapters/pom.xml | 33 ++--
jspwiki-210-test-adaptees/pom.xml | 2 +-
.../{pom.xml => pom.xml.versionsBackup} | 2 +-
jspwiki-api/pom.xml | 25 ++-
.../src/main/java/org/apache/wiki/api/Release.java | 6 +-
.../java/org/apache/wiki/api/core/Context.java | 4 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 2 +-
.../java/org/apache/wiki/api/spi/ContextDSL.java | 2 +-
.../java/org/apache/wiki/api/spi/ContextSPI.java | 2 +-
.../java/org/apache/wiki/api/spi/EngineDSL.java | 4 +-
.../java/org/apache/wiki/api/spi/EngineSPI.java | 2 +-
.../java/org/apache/wiki/api/spi/SessionDSL.java | 2 +-
.../java/org/apache/wiki/api/spi/SessionSPI.java | 2 +-
.../main/java/org/apache/wiki/api/spi/Wiki.java | 2 +-
.../apache/wiki/api/spi/ContextSPITestImpl.java | 2 +-
.../org/apache/wiki/api/spi/EngineSPITestImpl.java | 2 +-
.../apache/wiki/api/spi/SessionSPITestImpl.java | 2 +-
.../java/org/apache/wiki/api/spi/WikiTest.java | 4 +-
jspwiki-bom/pom.xml | 2 +-
jspwiki-bootstrap/pom.xml | 25 ++-
.../WikiBootstrapServletContextListener.java | 16 +-
.../WikiBootstrapServletContextListenerTest.java | 4 +-
.../wiki/bootstrap/spi/ContextSPITestImpl.java | 2 +-
.../wiki/bootstrap/spi/EngineSPITestImpl.java | 2 +-
.../wiki/bootstrap/spi/SessionSPITestImpl.java | 2 +-
jspwiki-cache/pom.xml | 4 +-
jspwiki-event/pom.xml | 2 +-
jspwiki-http/pom.xml | 18 +-
.../wiki/http/filter/CsrfProtectionFilter.java | 16 +-
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 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-kendra-searchprovider/pom.xml | 29 ++--
jspwiki-main/pom.xml | 54 +++---
.../src/main/java/org/apache/wiki/WikiContext.java | 6 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 4 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 14 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 4 +-
.../main/java/org/apache/wiki/ajax/AjaxUtil.java | 4 +-
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 10 +-
.../java/org/apache/wiki/ajax/WikiAjaxServlet.java | 6 +-
.../apache/wiki/attachment/AttachmentServlet.java | 51 +++---
.../apache/wiki/auth/AuthenticationManager.java | 2 +-
.../org/apache/wiki/auth/AuthorizationManager.java | 2 +-
.../main/java/org/apache/wiki/auth/Authorizer.java | 2 +-
.../wiki/auth/DefaultAuthenticationManager.java | 4 +-
.../wiki/auth/DefaultAuthorizationManager.java | 2 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 6 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 8 +-
.../apache/wiki/auth/authorize/GroupManager.java | 2 +-
.../apache/wiki/auth/authorize/WebAuthorizer.java | 6 +-
.../auth/authorize/WebContainerAuthorizer.java | 8 +-
.../wiki/auth/login/AnonymousLoginModule.java | 4 +-
.../auth/login/CookieAssertionLoginModule.java | 8 +-
.../login/CookieAuthenticationLoginModule.java | 6 +-
.../wiki/auth/login/HttpRequestCallback.java | 6 +-
.../auth/login/WebContainerCallbackHandler.java | 2 +-
.../wiki/auth/login/WebContainerLoginModule.java | 4 +-
.../wiki/auth/login/WikiCallbackHandler.java | 2 +-
.../apache/wiki/auth/user/DefaultUserProfile.java | 2 +-
.../org/apache/wiki/auth/user/UserProfile.java | 2 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 6 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 2 +-
.../main/java/org/apache/wiki/plugin/Denounce.java | 2 +-
.../org/apache/wiki/plugin/SampleAjaxPlugin.java | 6 +-
.../org/apache/wiki/preferences/Preferences.java | 4 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 10 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 2 +-
.../src/main/java/org/apache/wiki/rss/Feed.java | 2 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 2 +-
.../apache/wiki/search/DefaultSearchManager.java | 4 +-
.../org/apache/wiki/spi/ContextSPIDefaultImpl.java | 2 +-
.../org/apache/wiki/spi/EngineSPIDefaultImpl.java | 2 +-
.../org/apache/wiki/spi/SessionSPIDefaultImpl.java | 2 +-
.../apache/wiki/tags/AdminBeanIteratorInfo.java | 6 +-
.../apache/wiki/tags/AttachmentsIteratorInfo.java | 6 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 4 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 4 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 4 +-
.../java/org/apache/wiki/tags/CheckLockInfo.java | 6 +-
.../java/org/apache/wiki/tags/CheckLockTag.java | 2 +-
.../java/org/apache/wiki/tags/CommentLinkTag.java | 2 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 4 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 10 +-
.../java/org/apache/wiki/tags/DiffLinkTag.java | 2 +-
.../java/org/apache/wiki/tags/EditLinkTag.java | 2 +-
.../org/apache/wiki/tags/EditorIteratorInfo.java | 6 +-
.../main/java/org/apache/wiki/tags/EditorTag.java | 4 +-
.../org/apache/wiki/tags/HistoryIteratorInfo.java | 6 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 4 +-
.../org/apache/wiki/tags/IfNoSearchResultsTag.java | 2 +-
.../main/java/org/apache/wiki/tags/IncludeTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 2 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 8 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 6 +-
.../main/java/org/apache/wiki/tags/LinkToTag.java | 2 +-
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 2 +-
.../main/java/org/apache/wiki/tags/ParamTag.java | 6 +-
.../main/java/org/apache/wiki/tags/PluginTag.java | 4 +-
.../java/org/apache/wiki/tags/RSSImageLinkTag.java | 2 +-
.../apache/wiki/tags/SearchResultIteratorInfo.java | 6 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 6 +-
.../org/apache/wiki/tags/SearchResultsSizeTag.java | 2 +-
.../org/apache/wiki/tags/SearchResultsTag.java | 2 +-
.../org/apache/wiki/tags/SetPaginationTag.java | 2 +-
.../org/apache/wiki/tags/SpamFilterInputsTag.java | 4 +-
.../src/main/java/org/apache/wiki/tags/TabTag.java | 2 +-
.../org/apache/wiki/tags/TabbedSectionTag.java | 4 +-
.../java/org/apache/wiki/tags/TranslateTag.java | 8 +-
.../java/org/apache/wiki/tags/UploadLinkTag.java | 2 +-
.../java/org/apache/wiki/tags/UserNameTag.java | 2 +-
.../java/org/apache/wiki/tags/UserProfileTag.java | 2 +-
.../java/org/apache/wiki/tags/VariableTag.java | 4 +-
.../java/org/apache/wiki/tags/WikiBodyTag.java | 8 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 8 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 4 +-
.../java/org/apache/wiki/ui/CommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 6 +-
.../java/org/apache/wiki/ui/EditorManager.java | 2 +-
.../main/java/org/apache/wiki/ui/Installer.java | 4 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 4 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 20 +--
.../org/apache/wiki/ui/WikiRequestWrapper.java | 4 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 18 +-
.../apache/wiki/ui/admin/WikiFormAdminBean.java | 4 +-
.../wiki/ui/admin/beans/PlainEditorAdminBean.java | 2 +-
.../org/apache/wiki/ui/admin/beans/UserBean.java | 2 +-
.../wiki/ui/progress/DefaultProgressManager.java | 4 +-
.../org/apache/wiki/url/DefaultURLConstructor.java | 2 +-
.../org/apache/wiki/url/ShortURLConstructor.java | 2 +-
.../apache/wiki/url/ShortViewURLConstructor.java | 2 +-
.../java/org/apache/wiki/url/URLConstructor.java | 2 +-
.../wiki/variables/DefaultVariableManager.java | 4 +-
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 10 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 4 +-
.../test/java/org/apache/wiki/WikiSessionTest.java | 18 +-
.../wiki/auth/AuthenticationManagerTest.java | 2 +-
.../java/org/apache/wiki/auth/TestAuthorizer.java | 6 +-
.../wiki/auth/login/AnonymousLoginModuleTest.java | 2 +-
.../auth/login/CookieAssertionLoginModuleTest.java | 2 +-
.../java/org/apache/wiki/plugin/DenounceTest.java | 0
.../org/apache/wiki/url/UrlConstructorTest.java | 2 +-
.../java/org/apache/wiki/web/TestContainer.java | 6 +-
jspwiki-main/src/test/resources/WEB-INF/web.xml | 10 +-
jspwiki-markdown/pom.xml | 31 +++-
jspwiki-portable/pom.xml | 2 +-
jspwiki-tika-searchprovider/pom.xml | 26 +--
jspwiki-util/pom.xml | 12 +-
.../main/java/org/apache/wiki/util/FormUtil.java | 2 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 6 +-
.../main/java/org/apache/wiki/util/MailUtil.java | 30 ++--
.../java/org/apache/wiki/util/PropertyReader.java | 25 ++-
.../java/org/apache/wiki/util/HttpUtilTest.java | 4 +-
.../java/org/apache/wiki/util/MailUtilTest.java | 2 +-
.../org/apache/wiki/util/PropertyReaderTest.java | 6 +-
jspwiki-war/pom.xml | 82 +++++++--
jspwiki-war/src/main/config/dev/OldChangeLog | 2 +-
jspwiki-war/src/main/webapp/Captcha.jsp | 4 +-
jspwiki-war/src/main/webapp/Comment.jsp | 6 +-
jspwiki-war/src/main/webapp/Error.jsp | 4 +-
jspwiki-war/src/main/webapp/Install.jsp | 2 +-
jspwiki-war/src/main/webapp/LostPassword.jsp | 4 +-
jspwiki-war/src/main/webapp/Rename.jsp | 2 +-
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 10 +-
jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 2 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 2 +-
.../main/webapp/templates/210/CommentContent.jsp | 4 +-
.../main/webapp/templates/210/ConflictContent.jsp | 4 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 6 +-
.../main/webapp/templates/210/DisplayMessage.jsp | 4 +-
.../src/main/webapp/templates/210/EditContent.jsp | 6 +-
.../main/webapp/templates/210/EditGroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/EditTemplate.jsp | 2 +-
.../src/main/webapp/templates/210/Favorites.jsp | 4 +-
.../src/main/webapp/templates/210/FindContent.jsp | 6 +-
.../src/main/webapp/templates/210/Footer.jsp | 4 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 4 +-
.../src/main/webapp/templates/210/Header.jsp | 2 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 6 +-
.../src/main/webapp/templates/210/LoginContent.jsp | 6 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 4 +-
.../webapp/templates/210/PageActionsBottom.jsp | 4 +-
.../main/webapp/templates/210/PageActionsTop.jsp | 4 +-
.../src/main/webapp/templates/210/PageContent.jsp | 4 +-
.../src/main/webapp/templates/210/PageTab.jsp | 4 +-
.../webapp/templates/210/PreferencesContent.jsp | 4 +-
.../main/webapp/templates/210/PreferencesTab.jsp | 8 +-
.../main/webapp/templates/210/PreviewContent.jsp | 4 +-
.../src/main/webapp/templates/210/ProfileTab.jsp | 6 +-
.../src/main/webapp/templates/210/SearchBox.jsp | 2 +-
.../main/webapp/templates/210/UploadTemplate.jsp | 4 +-
.../src/main/webapp/templates/210/UserBox.jsp | 4 +-
.../src/main/webapp/templates/210/ViewTemplate.jsp | 2 +-
.../main/webapp/templates/210/WorkflowContent.jsp | 6 +-
.../webapp/templates/210/admin/UserManagement.jsp | 4 +-
.../src/main/webapp/templates/210/commonheader.jsp | 4 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 4 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 4 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 4 +-
.../main/webapp/templates/210/editors/plain.jsp | 4 +-
.../main/webapp/templates/210/editors/preview.jsp | 4 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 4 +-
.../main/webapp/templates/default/AJAXPreview.jsp | 2 +-
.../main/webapp/templates/default/AJAXSearch.jsp | 6 +-
.../webapp/templates/default/AttachmentTab.jsp | 6 +-
.../webapp/templates/default/CommentContent.jsp | 6 +-
.../webapp/templates/default/ConflictContent.jsp | 4 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 6 +-
.../webapp/templates/default/DisplayMessage.jsp | 4 +-
.../main/webapp/templates/default/EditContent.jsp | 6 +-
.../webapp/templates/default/EditGroupContent.jsp | 8 +-
.../main/webapp/templates/default/EditTemplate.jsp | 2 +-
.../main/webapp/templates/default/FindContent.jsp | 6 +-
.../src/main/webapp/templates/default/Footer.jsp | 4 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 6 +-
.../src/main/webapp/templates/default/Header.jsp | 6 +-
.../main/webapp/templates/default/InfoContent.jsp | 8 +-
.../main/webapp/templates/default/LoginContent.jsp | 6 +-
.../src/main/webapp/templates/default/Nav.jsp | 8 +-
.../main/webapp/templates/default/PageContent.jsp | 4 +-
.../src/main/webapp/templates/default/PageInfo.jsp | 4 +-
.../src/main/webapp/templates/default/PageTab.jsp | 6 +-
.../templates/default/PreferencesContent.jsp | 6 +-
.../webapp/templates/default/PreferencesTab.jsp | 8 +-
.../webapp/templates/default/PreviewContent.jsp | 4 +-
.../main/webapp/templates/default/ProfileTab.jsp | 6 +-
.../main/webapp/templates/default/SearchBox.jsp | 2 +-
.../src/main/webapp/templates/default/Sidebar.jsp | 6 +-
.../webapp/templates/default/UploadTemplate.jsp | 6 +-
.../src/main/webapp/templates/default/UserBox.jsp | 6 +-
.../main/webapp/templates/default/ViewTemplate.jsp | 4 +-
.../webapp/templates/default/WorkflowContent.jsp | 8 +-
.../templates/default/admin/UserManagement.jsp | 4 +-
.../main/webapp/templates/default/commonheader.jsp | 4 +-
.../webapp/templates/default/editors/CKeditor.jsp | 6 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 6 +-
.../webapp/templates/default/editors/plain.jsp | 6 +-
.../webapp/templates/default/editors/preview.jsp | 4 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 6 +-
.../main/webapp/templates/reader/ViewTemplate.jsp | 2 +-
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 | 25 ++-
pom.xml | 187 +++++++++++++++++----
261 files changed, 976 insertions(+), 749 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9218307b2..d926af9ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
-bin
-target
-.settings
-.classpath
-.project
-nb-configuration.xml
-**/*.iml
-.idea
-.metadata
-.checkstyle
-**/node_modules/*
-.vscode
+bin
+target
+.settings
+.classpath
+.project
+nb-configuration.xml
+**/*.iml
+.idea
+.metadata
+.checkstyle
+**/node_modules/*
+.vscode
diff --git a/jspwiki-210-adapters/pom.xml b/jspwiki-210-adapters/pom.xml
index 65b5c4004..3038f8770 100644
--- a/jspwiki-210-adapters/pom.xml
+++ b/jspwiki-210-adapters/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,45 +33,44 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <artifactId>jspwiki-main</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
+-->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-main</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
+<!--
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-210-test-adaptees</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+-->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
diff --git a/jspwiki-210-test-adaptees/pom.xml b/jspwiki-210-test-adaptees/pom.xml
index eafb55d39..9676b4c82 100644
--- a/jspwiki-210-test-adaptees/pom.xml
+++ b/jspwiki-210-test-adaptees/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-210-test-adaptees/pom.xml b/jspwiki-210-test-adaptees/pom.xml.versionsBackup
similarity index 98%
copy from jspwiki-210-test-adaptees/pom.xml
copy to jspwiki-210-test-adaptees/pom.xml.versionsBackup
index eafb55d39..fdc8f90ab 100644
--- a/jspwiki-210-test-adaptees/pom.xml
+++ b/jspwiki-210-test-adaptees/pom.xml.versionsBackup
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>2.12.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-api/pom.xml b/jspwiki-api/pom.xml
index 157d8a099..a6a7a4cf2 100644
--- a/jspwiki-api/pom.xml
+++ b/jspwiki-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,13 +33,11 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-event</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -57,17 +55,18 @@
<artifactId>commons-lang3</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
+</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 0b967313f..2549fd198 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -53,13 +53,13 @@ public final class Release {
private static final String POSTFIX = "-git-";
/** The JSPWiki major version. */
- public static final int VERSION = 2;
+ public static final int VERSION = 3;
/** The JSPWiki revision. */
- public static final int REVISION = 12;
+ public static final int REVISION = 0;
/** The minor revision. */
- public static final int MINORREVISION = 4;
+ public static final int MINORREVISION = 0;
/** The build number/identifier. This is a String as opposed to an integer, just so that people can add other identifiers to it.
* The build number is incremented every time a committer checks in code, and reset when a release is made.
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java
index 6bd09012f..9b6b2b1ec 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java
@@ -18,8 +18,8 @@
*/
package org.apache.wiki.api.core;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
import java.security.Principal;
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
index 49a0ef716..a456c4d46 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
@@ -27,7 +27,7 @@ import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java
index 909bfaeda..af13ab2e8 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class ContextDSL {
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java
index b9916a7ce..3200e5895 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java
index da5586be3..89c5d20b8 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java
@@ -20,8 +20,8 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.api.core.Engine;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
import java.util.Properties;
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java
index 90c9da202..54f8b771c 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java
@@ -20,7 +20,7 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.api.core.Engine;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.util.Properties;
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java
index fe57ce032..5f6401e52 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java
@@ -21,7 +21,7 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java
index f0c5f1574..8c95d25ad 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java
@@ -21,7 +21,7 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java
index 93e03cceb..567488a6d 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java
@@ -21,7 +21,7 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.util.PropertyReader;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.nio.file.ProviderNotFoundException;
import java.util.Properties;
import java.util.ServiceLoader;
diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java
index 38e924507..4779b69cb 100644
--- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java
+++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class ContextSPITestImpl implements ContextSPI {
diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java
index c7c30cd7d..22bf1c547 100644
--- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java
+++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java
@@ -20,7 +20,7 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.api.core.Engine;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.util.Properties;
diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java
index 15517cede..b361f6c19 100644
--- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java
+++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java
@@ -21,7 +21,7 @@ package org.apache.wiki.api.spi;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class SessionSPITestImpl implements SessionSPI {
diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java
index 06ca0b3cb..8c19398d6 100644
--- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java
+++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java
@@ -25,8 +25,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
import java.util.Properties;
diff --git a/jspwiki-bom/pom.xml b/jspwiki-bom/pom.xml
index 5844a5918..fb45b3563 100644
--- a/jspwiki-bom/pom.xml
+++ b/jspwiki-bom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-bootstrap/pom.xml b/jspwiki-bootstrap/pom.xml
index 5c062a91c..3a3b71891 100644
--- a/jspwiki-bootstrap/pom.xml
+++ b/jspwiki-bootstrap/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,26 +33,25 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-util</artifactId>
- <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
+</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java b/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
index db05a2a54..8fc564e17 100644
--- a/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
+++ b/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
@@ -18,6 +18,12 @@
*/
package org.apache.wiki.bootstrap;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
@@ -27,13 +33,9 @@ import org.apache.logging.log4j.core.config.properties.PropertiesConfigurationFa
import org.apache.wiki.api.spi.Wiki;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
+
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
public class WikiBootstrapServletContextListener implements ServletContextListener {
diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java
index 4b2b85e1b..07de185c4 100644
--- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java
+++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
import java.util.Properties;
diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java
index ea19f1340..9a8cbac74 100644
--- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java
+++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java
@@ -24,7 +24,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.spi.ContextSPI;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class ContextSPITestImpl implements ContextSPI {
diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java
index 6e3b49a06..3deec067b 100644
--- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java
+++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java
@@ -21,7 +21,7 @@ package org.apache.wiki.bootstrap.spi;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.spi.EngineSPI;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.util.Properties;
diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java
index 9b26d16a1..183d667fe 100644
--- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java
+++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java
@@ -22,7 +22,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.spi.SessionSPI;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class SessionSPITestImpl implements SessionSPI {
diff --git a/jspwiki-cache/pom.xml b/jspwiki-cache/pom.xml
index ada505988..617b701aa 100644
--- a/jspwiki-cache/pom.xml
+++ b/jspwiki-cache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,13 +33,11 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/jspwiki-event/pom.xml b/jspwiki-event/pom.xml
index be2a47c0a..685cbddf1 100644
--- a/jspwiki-event/pom.xml
+++ b/jspwiki-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-http/pom.xml b/jspwiki-http/pom.xml
index 1dd892fe6..095d139bc 100644
--- a/jspwiki-http/pom.xml
+++ b/jspwiki-http/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,15 +33,19 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-util</artifactId>
- <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-event</artifactId>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -52,11 +56,11 @@
<artifactId>log4j-1.2-api</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java b/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
index c9d25dde2..cc15c05e2 100644
--- a/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
+++ b/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
@@ -24,14 +24,14 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.spi.Wiki;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
index 89f754db0..aed0cef81 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
index c5f75b0b3..7a2ddf87e 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<!-- Container Managed Authentication -->
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
index 5db628fcc..4db2eb7ba 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
index b7d45f37e..76984090a 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom-jdbc</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
index 2e92b9445..2d6b78174 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
index 5553f03c2..7c0b2135f 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index 61d1ee699..c6ae8edbf 100644
--- a/jspwiki-it-tests/pom.xml
+++ b/jspwiki-it-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.jspwiki.it</groupId>
diff --git a/jspwiki-kendra-searchprovider/pom.xml b/jspwiki-kendra-searchprovider/pom.xml
index c9e9b9efe..15fe7d77c 100644
--- a/jspwiki-kendra-searchprovider/pom.xml
+++ b/jspwiki-kendra-searchprovider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-kendra-searchprovider</artifactId>
@@ -34,22 +34,27 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-kendra</artifactId>
- </dependency>
-
+ <!--
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
<type>test-jar</type>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+-->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-kendra</artifactId>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -87,11 +92,11 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>net.sourceforge.stripes</groupId>
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index ccd862113..aeb8a6fec 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,37 +33,31 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-event</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-cache</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-http</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-wysiwyg</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -71,10 +65,16 @@
<artifactId>gson</artifactId>
</dependency>
+<!--
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
+-->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ </dependency>
<dependency>
<groupId>net.sourceforge</groupId>
@@ -86,11 +86,6 @@
<artifactId>sandler</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -171,17 +166,32 @@
<artifactId>xmlrpc</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
+</dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <scope>provided</scope>
+</dependency>
+
+
+<dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <scope>provided</scope>
+</dependency>
+
<dependency>
<groupId>com.github.jbellis</groupId>
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
index 640b9ae90..ffa4868fb 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
@@ -40,9 +40,9 @@ import org.apache.wiki.ui.PageCommand;
import org.apache.wiki.ui.WikiCommand;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.PageContext;
import java.security.Permission;
import java.security.Principal;
import java.util.HashMap;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 4ec79d82e..d2b83eb6d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -61,8 +61,8 @@ import org.apache.wiki.util.TextUtil;
import org.apache.wiki.variables.VariableManager;
import org.apache.wiki.workflow.WorkflowManager;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
index 5834bd2a7..2cd1f63dc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
@@ -25,12 +25,12 @@ import org.apache.wiki.api.engine.EngineLifecycleExtension;
import org.apache.wiki.api.spi.Wiki;
import org.apache.wiki.url.URLConstructor;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -61,7 +61,7 @@ public class WikiServlet extends HttpServlet {
* protected method {@link WikiEngine#stop()}, which sends {@link org.apache.wiki.event.WikiEngineEvent#SHUTDOWN}
* events to registered listeners, as well as notifying available {@link EngineLifecycleExtension EngineLifecycleExtension}s.
*
- * @see javax.servlet.GenericServlet#destroy()
+ * @see jakarta.servlet.GenericServlet#destroy()
*/
@Override
public void destroy() {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
index c6e3f1eb5..d14fe3de5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -39,8 +39,8 @@ import org.apache.wiki.event.WikiSecurityEvent;
import org.apache.wiki.util.HttpUtil;
import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.security.Principal;
import java.util.Arrays;
import java.util.HashSet;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
index be42896df..15163bfaf 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
@@ -21,8 +21,8 @@ package org.apache.wiki.ajax;
import com.google.gson.Gson;
import org.apache.commons.lang3.StringUtils;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
/**
* Helpful utilities for the Ajax functions.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
index 24edcb02a..cc1d4fb56 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
@@ -28,11 +28,11 @@ import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PagePermission;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Permission;
import java.util.ArrayList;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java
index 366a3e06b..44e49845b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java
@@ -21,9 +21,9 @@ package org.apache.wiki.ajax;
import org.apache.wiki.plugin.SampleAjaxPlugin;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
index 1e6375437..6759087b1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
@@ -18,12 +18,24 @@
*/
package org.apache.wiki.attachment;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.ProgressListener;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.nio.charset.StandardCharsets;
+import java.security.Permission;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+//import org.apache.commons.fileupload2.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileItemFactory;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.core.ProgressListener;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Attachment;
@@ -46,23 +58,12 @@ import org.apache.wiki.ui.progress.ProgressManager;
import org.apache.wiki.util.HttpUtil;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.SocketException;
-import java.nio.charset.StandardCharsets;
-import java.security.Permission;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
@@ -384,7 +385,7 @@ public class AttachmentServlet extends HttpServlet {
final String errorPage = m_engine.getURL( ContextEnum.WIKI_ERROR.getRequestContext(), "", null ); // If something bad happened, Upload should be able to take care of most stuff
String nextPage = errorPage;
final String progressId = req.getParameter( "progressid" );
-
+/*
// Check that we have a file upload request
if( !ServletFileUpload.isMultipartContent(req) ) {
throw new RedirectException( "Not a file upload", errorPage );
@@ -474,6 +475,8 @@ public class AttachmentServlet extends HttpServlet {
}
return nextPage;
+ */
+ return null;
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
index 3657473ca..0d4a88472 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
@@ -28,7 +28,7 @@ import org.apache.wiki.event.WikiSecurityEvent;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.Map;
import java.util.Set;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
index 74e11de2a..28d2dab91 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
@@ -26,7 +26,7 @@ import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiSecurityEvent;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.AccessController;
import java.security.Permission;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java
index 84468d7b6..a5d8c8957 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java
@@ -32,7 +32,7 @@ import java.util.Properties;
* injected, the Authorizer is queried for the roles it knows about by calling {@link org.apache.wiki.auth.Authorizer#getRoles()}. Then,
* each role returned by the Authorizer is tested by calling {@link org.apache.wiki.auth.Authorizer#isUserInRole(Session, Principal)}.
* If this check fails, and the Authorizer is of type WebAuthorizer, AuthenticationManager checks the role again by calling
- * {@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, Principal)}).
+ * {@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(jakarta.servlet.http.HttpServletRequest, Principal)}).
* Any roles that pass the test are injected into the Subject by firing appropriate authentication events.
*
* @since 2.3
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
index 6f86584c1..52965eb65 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
@@ -44,8 +44,8 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.security.Principal;
import java.util.Collections;
import java.util.HashMap;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
index f39f65cdc..8fe4e8407 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
@@ -46,7 +46,7 @@ import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.ClassUtil;
import org.freshcookies.security.policy.LocalPolicy;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.net.URL;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
index 124e9d35e..ceb9f50f3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
@@ -56,9 +56,9 @@ import org.apache.wiki.workflow.Workflow;
import org.apache.wiki.workflow.WorkflowBuilder;
import org.apache.wiki.workflow.WorkflowManager;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Permission;
import java.security.Principal;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
index dc7e082e1..20abbd3f8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
@@ -28,10 +28,10 @@ import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiSecurityEvent;
import org.apache.wiki.util.comparators.PrincipalComparator;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
import java.security.Principal;
import java.util.Arrays;
import java.util.Collection;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
index e2816eb1d..58a0f672d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
@@ -28,7 +28,7 @@ import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiSecurityEvent;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
index ea9ec291a..572b84e81 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
@@ -20,19 +20,19 @@ package org.apache.wiki.auth.authorize;
import org.apache.wiki.auth.Authorizer;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
/**
* Extends the {@link org.apache.wiki.auth.Authorizer} interface by including a delegate method for
- * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}.
+ * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)}.
*/
public interface WebAuthorizer extends Authorizer {
/**
* Determines whether a user associated with an HTTP request possesses a particular role. This method simply delegates to
- * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)} by converting the Principal's name to a String.
+ * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)} by converting the Principal's name to a String.
*
* @param request the HTTP request
* @param role the role to check
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
index b8e3490d5..efb142178 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
@@ -35,7 +35,7 @@ import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URL;
import java.security.Principal;
@@ -56,7 +56,7 @@ import java.util.stream.Collectors;
*/
public class WebContainerAuthorizer implements WebAuthorizer {
- private static final String J2EE_SCHEMA_25_NAMESPACE = "http://xmlns.jcp.org/xml/ns/javaee";
+ private static final String J2EE_SCHEMA_25_NAMESPACE = "https://jakarta.ee/xml/ns/jakartaee";
private static final Logger LOG = LogManager.getLogger( WebContainerAuthorizer.class );
@@ -128,7 +128,7 @@ public class WebContainerAuthorizer implements WebAuthorizer {
/**
* Determines whether a user associated with an HTTP request possesses
* a particular role. This method simply delegates to
- * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}
+ * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)}
* by converting the Principal's name to a String.
* @param request the HTTP request
* @param role the role to check
@@ -147,7 +147,7 @@ public class WebContainerAuthorizer implements WebAuthorizer {
* return <code>false</code>.
* This method simply examines the Session subject to see if it
* possesses the desired Principal. We assume that the method
- * {@link org.apache.wiki.ui.WikiServletFilter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)}
+ * {@link org.apache.wiki.ui.WikiServletFilter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain)}
* previously executed, and that it has set the Session
* subject correctly by logging in the user with the various login modules,
* in particular {@link org.apache.wiki.auth.login.WebContainerLoginModule}}.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
index 6da91a51f..f10c76d6f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
@@ -26,8 +26,8 @@ import org.apache.wiki.util.HttpUtil;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
index ac626b1e7..62d961897 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
@@ -28,10 +28,10 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
index 1d98e66cb..ceffa060f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
@@ -29,9 +29,9 @@ import org.apache.wiki.util.TextUtil;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java
index f98482ceb..87c4655e6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java
@@ -19,14 +19,14 @@
package org.apache.wiki.auth.login;
import javax.security.auth.callback.Callback;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Callback for requesting and supplying a HttpServletRequest required by a
* LoginModule. This Callback is used by LoginModules needing access to the
* servlet request.
- * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() or
- * @see javax.servlet.http.HttpServletRequest#getRemoteUser() methods.
+ * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal() or
+ * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser() methods.
* @since 2.3
*/
public class HttpRequestCallback implements Callback
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
index 85e7f8a5d..31087b7e3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
index 68f3c8dd1..d0a77da2e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
@@ -26,8 +26,8 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.security.Principal;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
index f7a89156e..bb4968620 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
@@ -26,7 +26,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
index a7d2e0ef1..3589c3144 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
@@ -20,7 +20,7 @@ package org.apache.wiki.auth.user;
import org.apache.commons.lang3.StringUtils;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java
index ec8afa447..374646b09 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java
@@ -161,7 +161,7 @@ public interface UserProfile extends Serializable
/**
* Sets the name by which the user logs in. The login name is used as the
* username for custom authentication (see
- * {@link org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.api.core.Session, javax.servlet.http.HttpServletRequest, String, String)},
+ * {@link org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.api.core.Session, jakarta.servlet.http.HttpServletRequest, String, String)},
* {@link org.apache.wiki.auth.login.UserDatabaseLoginModule}). The login
* name is typically a short name ("jannej"). In contrast, the wiki name is
* typically of type FirstnameLastName ("JanneJalkanen").
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
index 1160d8b74..fb3ed02db 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
@@ -56,9 +56,9 @@ import org.suigeneris.jrcs.diff.delta.DeleteDelta;
import org.suigeneris.jrcs.diff.delta.Delta;
import org.suigeneris.jrcs.diff.myers.MyersDiff;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
index 675f20df0..8e082d440 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
@@ -49,7 +49,7 @@ import org.apache.wiki.util.XhtmlUtil;
import org.apache.wiki.util.XmlUtil;
import org.jdom2.Element;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StreamTokenizer;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
index 95aa8b24c..97bf81142 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
@@ -33,7 +33,7 @@ import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
index 37ad2bced..c439cdaa8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
@@ -23,9 +23,9 @@ import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.Plugin;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
index 466da6f1b..a440a1f52 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
@@ -30,8 +30,8 @@ import org.apache.wiki.util.HttpUtil;
import org.apache.wiki.util.PropertyReader;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
index 949c2b125..6e98dca0d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
@@ -40,11 +40,11 @@ import org.intabulas.sandler.elements.Person;
import org.intabulas.sandler.elements.impl.LinkImpl;
import org.intabulas.sandler.exceptions.FeedMarshallException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collection;
import java.util.Date;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
index c5fe0dc27..c22e584c0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
@@ -32,7 +32,7 @@ import org.jdom2.Namespace;
import org.jdom2.output.Format;
import org.jdom2.output.XMLOutputter;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
index 3842cab53..5e937c682 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
@@ -24,7 +24,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.variables.VariableManager;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.util.ArrayList;
import java.util.List;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
index f4798018e..4816eb1d8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
@@ -31,7 +31,7 @@ import org.jdom2.Element;
import org.jdom2.output.Format;
import org.jdom2.output.XMLOutputter;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.io.IOException;
import java.io.StringWriter;
import java.text.SimpleDateFormat;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
index e22bd142f..c31ae6fda 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
@@ -43,8 +43,8 @@ import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java
index fd05b935d..bf2b1d452 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java
@@ -25,7 +25,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.spi.ContextSPI;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java
index 7ecac1de8..fe4ed7650 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java
@@ -22,7 +22,7 @@ import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.spi.EngineSPI;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.util.Properties;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java
index b05f03725..c431adc4a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.spi.SessionSPI;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
index ecd349017..a744fc772 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* Just provides iteration support for AdminBeanIteratorTag
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
index c7b5110ce..cd7cc5d98 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* Just provides the TEI data for AttachmentsIteratorTag.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
index d95e83acf..ece36d3db 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
@@ -28,8 +28,8 @@ import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
import java.util.List;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
index bca0fb416..60af85583 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
@@ -24,8 +24,8 @@ import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
import java.io.Serializable;
import java.util.LinkedList;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
index da96b48f4..ea8ae53f2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
@@ -27,8 +27,8 @@ import org.apache.wiki.pages.PageManager;
import org.apache.wiki.util.HttpUtil;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
index a3d00ce4f..3e62d67f2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* A companion to CheckLogTag.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
index 537049487..1c4aaccaa 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
@@ -24,7 +24,7 @@ import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.pages.PageLock;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
index 826a18025..5788bdc72 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
@@ -22,7 +22,7 @@ import org.apache.wiki.InternalWikiException;
import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.core.Page;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
index 5cb551913..f4d18c683 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
@@ -24,8 +24,8 @@ import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.ui.TemplateManager;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
index b49974751..453a5420a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
@@ -27,11 +27,11 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java
index 01fce48c9..83ab21f1b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java
@@ -24,7 +24,7 @@ import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.providers.WikiProvider;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java
index e20e2900a..e06f40bf6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
index 1da79cad2..d9dbb8ae5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* Just provides the TEI data for EditorIteratorTag.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java
index b97a3798d..17e2590ad 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java
@@ -24,8 +24,8 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.ui.EditorManager;
import org.apache.wiki.ui.TemplateManager;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
index 374902736..f2c72c037 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* Just provides the TEI data for HistoryIteratorTag.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
index f5194137f..429e98bb3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
@@ -26,8 +26,8 @@ import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
import java.util.List;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
index 2c7ac5b78..327f6e311 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
@@ -20,7 +20,7 @@ package org.apache.wiki.tags;
import java.io.IOException;
import java.util.Collection;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java
index bff6d9466..ec6c617c2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java
@@ -24,8 +24,8 @@ import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.ui.TemplateManager;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
index 3d64093b7..5b2c10761 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
@@ -25,8 +25,8 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.diff.DifferenceManager;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
index f86f028ee..141b54e70 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
@@ -26,7 +26,7 @@ import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.render.RenderingManager;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
index 9f91c19a0..cfbbd9129 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
@@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Page;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
index b54cdb6d3..32cc229af 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
@@ -32,9 +32,9 @@ import org.apache.wiki.parser.LinkParsingOperations;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTag;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
index 1ea602c09..dae8a0ed8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.attachment.AttachmentManager;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
index 1e64efd5c..5292468e1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
index 9592532f8..406a76dc0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* ParamTag submits name-value pairs to the first enclosing
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java
index e1acc7919..faae992e4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java
@@ -24,8 +24,8 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.plugin.PluginManager;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyContent;
import java.io.IOException;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java
index 2db5f9319..297ff72cc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java
@@ -24,7 +24,7 @@ import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.rss.RSSGenerator;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ResourceBundle;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
index 4ee2e3f27..654d07430 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java
index cb5ee1f5f..9f643f4ef 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java
@@ -27,9 +27,9 @@ import org.apache.wiki.api.search.SearchResult;
import org.apache.wiki.api.spi.Wiki;
import org.apache.wiki.ui.PageCommand;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
import java.util.Collection;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
index a7095f80d..9b026fb58 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
@@ -20,7 +20,7 @@ package org.apache.wiki.tags;
import java.io.IOException;
import java.util.Collection;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
* Outputs the size of the search results list, if it contains any items.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
index 96ac7ef7b..1c86cc032 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
@@ -20,7 +20,7 @@ package org.apache.wiki.tags;
import java.io.IOException;
import java.util.Collection;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
index 6b3e105ea..3d503aaae 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
@@ -20,7 +20,7 @@ package org.apache.wiki.tags;
import java.io.IOException;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
+import jakarta.servlet.jsp.jstl.fmt.LocaleSupport;
import org.apache.wiki.util.TextUtil;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
index 25d66cf1a..12dafa2fd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
@@ -22,8 +22,8 @@ package org.apache.wiki.tags;
import org.apache.wiki.filters.SpamFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* Provides hidden input fields which are checked by the {@code SpamFilter}.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
index da51e4960..5fad6573a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
@@ -21,7 +21,7 @@ package org.apache.wiki.tags;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java
index 078d28df3..a47a22515 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java
@@ -18,8 +18,8 @@
*/
package org.apache.wiki.tags;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.*;
+import jakarta.servlet.jsp.tagext.*;
/**
* Generates tabbed page section: container for the Tab tag.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java
index 05795f58d..9c31617ca 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java
@@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.render.RenderingManager;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
/**
* Converts the body text into HTML content.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java
index cd5b01ab6..4a23811ed 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java
@@ -20,7 +20,7 @@ package org.apache.wiki.tags;
import org.apache.wiki.api.core.ContextEnum;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java
index 88227f239..f878e283b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java
@@ -25,7 +25,7 @@ import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.security.Principal;
import java.util.regex.Pattern;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java
index efc37742c..a339a6744 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java
@@ -31,7 +31,7 @@ import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.security.Principal;
import java.util.Arrays;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java
index 4f746523d..b53a29fc2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java
@@ -23,8 +23,8 @@ import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.util.TextUtil;
import org.apache.wiki.variables.VariableManager;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
import java.io.IOException;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
index 39bafbd24..dc7ed2381 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
@@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.core.Context;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
import java.io.IOException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
index 8eeb701f4..a7b92ca40 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
@@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java b/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java
index 7893ebdc5..fd81abacc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java
@@ -33,8 +33,8 @@ import org.apache.wiki.workflow.Outcome;
import org.apache.wiki.workflow.Task;
import org.apache.wiki.workflow.WorkflowManager;
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.AddressException;
import java.util.Locale;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java
index 1a161b101..5fce3eefc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java
@@ -22,7 +22,7 @@ import org.apache.wiki.api.core.Command;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
index 71dda837e..342c1f3f7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
@@ -33,7 +33,7 @@ import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.url.URLConstructor;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
index 8df0b4f05..6412e9327 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
@@ -29,9 +29,9 @@ import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
index 3c1236aa3..befae7168 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
@@ -22,7 +22,7 @@ import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.engine.Initializable;
import org.apache.wiki.modules.ModuleManager;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
index ac9b439de..f3ec65bd2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
@@ -35,8 +35,8 @@ import org.apache.wiki.pages.PageManager;
import org.apache.wiki.providers.FileSystemProvider;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
index b1fa47c74..a0f3c08e6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
@@ -26,8 +26,8 @@ import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.ClassUtil;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.fmt.LocaleSupport;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedHashMap;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index 67893f04b..92a725e6e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -30,16 +30,16 @@ import org.apache.wiki.event.WikiPageEvent;
import org.apache.wiki.url.URLConstructor;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java
index 19c63984d..2d6acd97d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java
@@ -23,8 +23,8 @@ import org.apache.wiki.api.core.Session;
import org.apache.wiki.auth.SessionMonitor;
import org.apache.wiki.auth.authorize.Role;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import java.security.Principal;
import java.util.Arrays;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 7d2bb0004..495c2acde 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
@@ -29,15 +29,15 @@ import org.apache.wiki.auth.AuthenticationManager;
import org.apache.wiki.auth.SessionMonitor;
import org.apache.wiki.auth.WikiSecurityException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
index 533d61263..674ae7640 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
@@ -22,8 +22,8 @@ import org.apache.wiki.api.core.Context;
import org.apache.wiki.parser.WikiDocument;
import org.apache.wiki.render.RenderingManager;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
index d6d8f14c0..246fea4a0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
@@ -25,7 +25,7 @@ import org.apache.wiki.ui.admin.AdminBean;
import org.apache.wiki.util.TextUtil;
import javax.management.NotCompliantMBeanException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* This class is still experimental.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
index 6b1755817..d16cbeb88 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
@@ -29,7 +29,7 @@ import org.apache.wiki.ui.admin.AdminBean;
import org.apache.wiki.ui.admin.SimpleAdminBean;
import javax.management.NotCompliantMBeanException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Date;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
index 4a7566ae5..c6d139c71 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
@@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.wiki.ajax.WikiAjaxDispatcherServlet;
import org.apache.wiki.ajax.WikiAjaxServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
index 5d77e6efa..1817485d5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
@@ -25,7 +25,7 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.ui.CommandResolver;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.nio.charset.Charset;
import java.util.Properties;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
index 0df62be56..05b4c2e36 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
@@ -25,7 +25,7 @@ import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.nio.charset.Charset;
import java.util.Properties;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
index 0207ea404..1dc5b8c85 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
@@ -21,7 +21,7 @@ package org.apache.wiki.url;
import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.core.Engine;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
index 5e5552970..d1b8b6d98 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
@@ -21,7 +21,7 @@ package org.apache.wiki.url;
import org.apache.wiki.api.engine.Initializable;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.nio.charset.Charset;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
index adce1b51e..7ccde7a22 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
@@ -34,8 +34,8 @@ import org.apache.wiki.modules.InternalModule;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.preferences.Preferences;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.lang.reflect.Method;
import java.security.Principal;
import java.util.Date;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
index d320ead11..db04c11a6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
@@ -31,11 +31,11 @@ import org.apache.xmlrpc.XmlRpcContext;
import org.apache.xmlrpc.XmlRpcHandlerMapping;
import org.apache.xmlrpc.XmlRpcServer;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
index 4e3766ec9..a8d926d06 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -51,8 +51,8 @@ import org.apache.wiki.util.FileUtil;
import org.apache.wiki.util.PropertyReader;
import org.apache.wiki.util.TextUtil;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileWriter;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java
index e40fad239..0fcf12cb4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java
@@ -37,15 +37,15 @@ import org.apache.wiki.ui.WikiServletFilter;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.security.Principal;
import java.util.HashSet;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
index 7258b24b4..65fb819cd 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.Map;
import java.util.Properties;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
index 6f0545bfd..548df2a6c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
@@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Session;
import org.apache.wiki.auth.authorize.Role;
import org.apache.wiki.auth.authorize.WebAuthorizer;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.Properties;
@@ -82,8 +82,8 @@ public class TestAuthorizer implements WebAuthorizer {
/**
* Returns <code>true</code> if the HTTP request contains
* a particular role principal. Delegates to
- * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}.
- * @see org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, java.security.Principal)
+ * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)}.
+ * @see org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(jakarta.servlet.http.HttpServletRequest, java.security.Principal)
*/
@Override public boolean isUserInRole( final HttpServletRequest request, final Principal role )
{
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
index eed86f650..f4df992f5 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
@@ -26,7 +26,7 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.wiki.TestEngine;
import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
index 91f53d5a9..b9f382e7f 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
@@ -33,7 +33,7 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
import java.security.Principal;
import java.util.HashMap;
import java.util.Properties;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java
old mode 100755
new mode 100644
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
index 4d0f77a5a..2a178bb94 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.nio.charset.StandardCharsets;
class UrlConstructorTest {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
index 70a8d316d..0f3e55862 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
@@ -38,9 +38,9 @@ import org.hsqldb.jdbc.JDBCDataSource;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
diff --git a/jspwiki-main/src/test/resources/WEB-INF/web.xml b/jspwiki-main/src/test/resources/WEB-INF/web.xml
index 52a51a203..cf74520d2 100644
--- a/jspwiki-main/src/test/resources/WEB-INF/web.xml
+++ b/jspwiki-main/src/test/resources/WEB-INF/web.xml
@@ -23,10 +23,10 @@
and container-managed authentication are enabled.
-->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+ version="5.0">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -38,7 +38,7 @@
<!-- Resource bundle default location -->
<context-param>
- <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+ <param-name>jakarta.servlet.jsp.jstl.fmt.localizationContext</param-name>
<param-value>templates.default</param-value>
</context-param>
@@ -265,7 +265,7 @@
<resource-ref>
<description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
<res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
+ <res-type>jakarta.mail.Session</res-type>
<res-auth>Container</res-auth>
</resource-ref>
REMOVE ME TO ENABLE JAVAMAIL -->
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 69c55358f..db6694e54 100644
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-markdown</artifactId>
@@ -31,21 +31,32 @@
<description>Apache JSPWiki markdown support</description>
<dependencies>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
+ </dependency>
+
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-wysiwyg</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
<type>test-jar</type>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+-->
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark</artifactId>
@@ -121,11 +132,13 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
+
+
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>net.sourceforge.stripes</groupId>
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index 9952c14c1..b675204d5 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-tika-searchprovider/pom.xml b/jspwiki-tika-searchprovider/pom.xml
index 489d0a785..4f99c4f85 100644
--- a/jspwiki-tika-searchprovider/pom.xml
+++ b/jspwiki-tika-searchprovider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-tika-searchprovider</artifactId>
@@ -34,18 +34,23 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
<type>test-jar</type>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
@@ -74,11 +79,12 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>net.sourceforge.stripes</groupId>
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index ef59b05e4..12fe67a95 100644
--- a/jspwiki-util/pom.xml
+++ b/jspwiki-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency>
@@ -46,8 +46,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
- <scope>test</scope>
+ <!--<scope>test</scope> -->
</dependency>
<dependency>
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java
index 5131e2a5c..c74352761 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* A collection of (static) utilities used by the WikiForms code.
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
index 33e089329..fc92172fc 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
@@ -22,9 +22,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index 3c7fbb597..a2aae8f9f 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -21,15 +21,15 @@ package org.apache.wiki.util;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Authenticator;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -146,7 +146,7 @@ import java.util.Set;
* <pre><resource-ref>
* <description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
* <res-ref-name>mail/Session</res-ref-name>
- * <res-type>javax.mail.Session</res-type>
+ * <res-type>jakarta.mail.Session</res-type>
* <res-auth>Container</res-auth>
* </resource-ref></pre>
* <p>To configure your container's resource factory, follow the directions supplied by
@@ -158,7 +158,7 @@ import java.util.Set;
* <pre><Context ...>
* ...
* <Resource name="mail/Session" auth="Container"
- * type="javax.mail.Session"
+ * type="jakarta.mail.Session"
* mail.smtp.host="127.0.0.1"/>
* mail.smtp.port="25"/>
* mail.smtp.account="your-account-name"/>
@@ -175,7 +175,7 @@ import java.util.Set;
* <code><var>$CATALINA_HOME</var>/conf/server.xml</code> creates a global resource:</p>
* <pre><GlobalNamingResources>
* <Resource name="mail/Session" auth="Container"
- * type="javax.mail.Session"
+ * type="jakarta.mail.Session"
* ...
* mail.smtp.starttls.enable="true"/>
* </GlobalNamingResources></pre>
@@ -264,7 +264,7 @@ public final class MailUtil {
* See the top-level JavaDoc for this class for a description of
* required properties and their default values.</p>
* <p>The e-mail address used for the <code>to</code> parameter must be in
- * RFC822 format, as described in the JavaDoc for {@link javax.mail.internet.InternetAddress}
+ * RFC822 format, as described in the JavaDoc for {@link jakarta.mail.internet.InternetAddress}
* and more fully at
* <a href="http://www.freesoft.org/CIE/RFC/822/index.htm">http://www.freesoft.org/CIE/RFC/822/index.htm</a>.
* In other words, e-mail addresses should look like this:</p>
@@ -365,7 +365,7 @@ public final class MailUtil {
* Returns a stand-alone JavaMail Session by looking up the correct mail account, password, host and others from a
* supplied set of properties. If the JavaMail property {@value #PROP_MAIL_ACCOUNT} is set to a value that is
* non-<code>null</code> and of non-zero length, the Session will be initialized with an instance of
- * {@link javax.mail.Authenticator}.
+ * {@link jakarta.mail.Authenticator}.
*
* @param props the properties that contain mail session properties.
* @return the initialized JavaMail Session.
@@ -434,7 +434,7 @@ public final class MailUtil {
}
/**
- * Simple {@link javax.mail.Authenticator} subclass that authenticates a user to
+ * Simple {@link jakarta.mail.Authenticator} subclass that authenticates a user to
* an SMTP server.
*/
protected static class SmtpAuthenticator extends Authenticator {
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index 0c6ae65ca..e076e3495 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -18,17 +18,26 @@
*/
package org.apache.wiki.util;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.AbstractMap;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import javax.servlet.ServletContext;
-import java.io.*;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.nio.file.Files;
+import jakarta.servlet.ServletContext;
/**
@@ -438,7 +447,7 @@ public final class PropertyReader {
/**
* This method sets the JSPWiki working directory (jspwiki.workDir). It first checks if this property
* is already set. If it isn't, it attempts to use the servlet container's temporary directory
- * (javax.servlet.context.tempdir). If that is also unavailable, it defaults to the system's temporary
+ * (jakarta.servlet.context.tempdir). If that is also unavailable, it defaults to the system's temporary
* directory (java.io.tmpdir).
* <p>
* This method is package-private to allow for unit testing.
@@ -450,7 +459,7 @@ public final class PropertyReader {
static void setWorkDir( final ServletContext servletContext, final Properties properties ) {
final String workDir = TextUtil.getStringProperty(properties, "jspwiki.workDir", null);
if (workDir == null) {
- final File tempDir = (File) servletContext.getAttribute("javax.servlet.context.tempdir");
+ final File tempDir = (File) servletContext.getAttribute("jakarta.servlet.context.tempdir");
if (tempDir != null) {
properties.setProperty("jspwiki.workDir", tempDir.getAbsolutePath());
LOG.info("Setting jspwiki.workDir to ServletContext's temporary directory: {}", tempDir.getAbsolutePath());
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java b/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
index c96d9728a..933cc1fcd 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
@@ -22,8 +22,8 @@ import net.sourceforge.stripes.mock.MockHttpServletRequest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java b/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
index a97c68786..2684eb3c0 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
import javax.net.ssl.SSLHandshakeException;
import java.net.ConnectException;
import java.util.Properties;
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java b/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
index e45c908e0..9f93d0fed 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -132,7 +132,7 @@ class PropertyReaderTest {
final Properties properties = new Properties();
final ServletContext servletContext = mock(ServletContext.class);
final File tmp = new File( "/tmp" );
- Mockito.when(servletContext.getAttribute( "javax.servlet.context.tempdir" ) ).thenReturn( tmp );
+ Mockito.when(servletContext.getAttribute( "jakarta.servlet.context.tempdir" ) ).thenReturn( tmp );
PropertyReader.setWorkDir( servletContext, properties );
@@ -147,7 +147,7 @@ class PropertyReaderTest {
Assertions.assertEquals( "/custom/dir", workDir );
// Test when the servlet's temporary directory is null, it should get set to system's temporary directory
- Mockito.when( servletContext.getAttribute( "javax.servlet.context.tempdir" ) ).thenReturn( null );
+ Mockito.when( servletContext.getAttribute( "jakarta.servlet.context.tempdir" ) ).thenReturn( null );
properties.remove( "jspwiki.workDir" );
PropertyReader.setWorkDir( servletContext, properties );
workDir = properties.getProperty( "jspwiki.workDir" );
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index ea536a044..da7a7280d 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,44 +34,50 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-bootstrap</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-markdown</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-210-adapters</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-kendra-searchprovider</artifactId>
- <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
+</dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+</dependency>
+<dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+</dependency>
+
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -80,12 +86,56 @@
<plugin>
<groupId>io.leonard.maven.plugins</groupId>
<artifactId>jspc-maven-plugin</artifactId>
+ <version>4.2.0</version>
+
<dependencies>
+
+
<dependency> <!-- so jspwiki custom taglibs can be seen by the jsp compiler -->
<groupId>${project.groupId}</groupId>
<artifactId>jspwiki-main</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>2.10.9.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+
</dependencies>
</plugin>
diff --git a/jspwiki-war/src/main/config/dev/OldChangeLog b/jspwiki-war/src/main/config/dev/OldChangeLog
index c8d26c130..7b17b1f87 100644
--- a/jspwiki-war/src/main/config/dev/OldChangeLog
+++ b/jspwiki-war/src/main/config/dev/OldChangeLog
@@ -6199,7 +6199,7 @@
declarations as follows:
New:
- <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+ <%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
Old:
diff --git a/jspwiki-war/src/main/webapp/Captcha.jsp b/jspwiki-war/src/main/webapp/Captcha.jsp
index a594f8007..66a0543c7 100644
--- a/jspwiki-war/src/main/webapp/Captcha.jsp
+++ b/jspwiki-war/src/main/webapp/Captcha.jsp
@@ -30,8 +30,8 @@
<%@ page import="org.apache.commons.lang3.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setBundle basename="CoreResources"/>
<%!
diff --git a/jspwiki-war/src/main/webapp/Comment.jsp b/jspwiki-war/src/main/webapp/Comment.jsp
index b0179041e..af9ab0b91 100644
--- a/jspwiki-war/src/main/webapp/Comment.jsp
+++ b/jspwiki-war/src/main/webapp/Comment.jsp
@@ -42,10 +42,10 @@
<%@ page import="org.apache.wiki.variables.VariableManager" %>
<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ page import="javax.servlet.http.Cookie" %>
+<%@ page import="jakarta.servlet.http.Cookie" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%!
Logger log = LogManager.getLogger("JSPWiki");
diff --git a/jspwiki-war/src/main/webapp/Error.jsp b/jspwiki-war/src/main/webapp/Error.jsp
index 02253ea17..c020cd208 100644
--- a/jspwiki-war/src/main/webapp/Error.jsp
+++ b/jspwiki-war/src/main/webapp/Error.jsp
@@ -52,10 +52,10 @@
// imported in JSP pages.
//
- if( exception instanceof javax.servlet.jsp.JspException )
+ if( exception instanceof jakarta.servlet.jsp.JspException )
{
log.debug("IS JSPEXCEPTION");
- realcause = ((javax.servlet.jsp.JspException)exception).getCause();
+ realcause = ((jakarta.servlet.jsp.JspException)exception).getCause();
log.debug("REALCAUSE="+realcause);
}
diff --git a/jspwiki-war/src/main/webapp/Install.jsp b/jspwiki-war/src/main/webapp/Install.jsp
index 0160d63a7..0f7a7fd28 100644
--- a/jspwiki-war/src/main/webapp/Install.jsp
+++ b/jspwiki-war/src/main/webapp/Install.jsp
@@ -29,7 +29,7 @@
<%@ page import="org.apache.logging.log4j.LogManager" %>
<%@ page import="java.util.ResourceBundle" %>
<%@ page import="java.text.MessageFormat" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setBundle basename="CoreResources"/>
<%!
diff --git a/jspwiki-war/src/main/webapp/LostPassword.jsp b/jspwiki-war/src/main/webapp/LostPassword.jsp
index d390800f8..a72dbcf7f 100644
--- a/jspwiki-war/src/main/webapp/LostPassword.jsp
+++ b/jspwiki-war/src/main/webapp/LostPassword.jsp
@@ -19,8 +19,8 @@
<%@ page import="java.util.*"%>
<%@ page import="java.text.*"%>
-<%@ page import="javax.mail.*"%>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*"%>
+<%@ page import="jakarta.mail.*"%>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*"%>
<%@ page import="org.apache.logging.log4j.Logger" %>
<%@ page import="org.apache.logging.log4j.LogManager" %>
<%@ page import="org.apache.wiki.api.core.Context" %>
diff --git a/jspwiki-war/src/main/webapp/Rename.jsp b/jspwiki-war/src/main/webapp/Rename.jsp
index b25d64af2..d456ac263 100644
--- a/jspwiki-war/src/main/webapp/Rename.jsp
+++ b/jspwiki-war/src/main/webapp/Rename.jsp
@@ -34,7 +34,7 @@
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setBundle basename="CoreResources"/>
<%!
Logger log = LogManager.getLogger("JSPWiki");
diff --git a/jspwiki-war/src/main/webapp/WEB-INF/web.xml b/jspwiki-war/src/main/webapp/WEB-INF/web.xml
index 761708dc8..c504ec15d 100644
--- a/jspwiki-war/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-war/src/main/webapp/WEB-INF/web.xml
@@ -18,10 +18,10 @@
under the License.
-->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+ version="5.0">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -43,7 +43,7 @@
<!-- Resource bundle default location -->
<context-param>
- <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+ <param-name>jakarta.servlet.jsp.jstl.fmt.localizationContext</param-name>
<param-value>templates.default</param-value>
</context-param>
@@ -253,7 +253,7 @@
<resource-ref>
<description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
<res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
+ <res-type>jakarta.mail.Session</res-type>
<res-auth>Container</res-auth>
</resource-ref>
REMOVE ME TO ENABLE JAVAMAIL -->
diff --git a/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp b/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp
index 915193113..c49f63ae7 100644
--- a/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp
+++ b/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp
@@ -25,7 +25,7 @@
<%@ page import="org.apache.wiki.auth.AuthorizationManager" %>
<%@ page import="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<%!
public void jspInit()
{
diff --git a/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp b/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
index c732ca2b3..a549ebeb1 100644
--- a/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
@@ -23,7 +23,7 @@
<%@ page import="org.apache.wiki.ui.progress.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ page import="java.security.Permission" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/CommentContent.jsp b/jspwiki-war/src/main/webapp/templates/210/CommentContent.jsp
index c23606a24..9c6cdba05 100644
--- a/jspwiki-war/src/main/webapp/templates/210/CommentContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/CommentContent.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.*" %>
<fmt:setLocale value="${prefs.Language}" />
diff --git a/jspwiki-war/src/main/webapp/templates/210/ConflictContent.jsp b/jspwiki-war/src/main/webapp/templates/210/ConflictContent.jsp
index 3d6fed5a6..a27d706f6 100644
--- a/jspwiki-war/src/main/webapp/templates/210/ConflictContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/ConflictContent.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection >
diff --git a/jspwiki-war/src/main/webapp/templates/210/DiffTab.jsp b/jspwiki-war/src/main/webapp/templates/210/DiffTab.jsp
index 257bea798..90f490808 100644
--- a/jspwiki-war/src/main/webapp/templates/210/DiffTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/DiffTab.jsp
@@ -18,14 +18,14 @@
--%>
<%@ page import="java.util.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/210/DisplayMessage.jsp b/jspwiki-war/src/main/webapp/templates/210/DisplayMessage.jsp
index df126a989..ab7adf696 100644
--- a/jspwiki-war/src/main/webapp/templates/210/DisplayMessage.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/DisplayMessage.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%-- Inserts a string message. --%>
diff --git a/jspwiki-war/src/main/webapp/templates/210/EditContent.jsp b/jspwiki-war/src/main/webapp/templates/210/EditContent.jsp
index 73b3ec392..68634cc16 100644
--- a/jspwiki-war/src/main/webapp/templates/210/EditContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/EditContent.jsp
@@ -18,11 +18,11 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.AttachmentManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp b/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
index f448264d5..e0c8f7ba8 100644
--- a/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="java.security.Principal" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="org.apache.wiki.api.core.*" %>
@@ -27,7 +27,7 @@
<%@ page import="org.apache.wiki.util.comparators.PrincipalComparator" %>
<%@ page import="org.apache.logging.log4j.Logger" %>
<%@ page import="org.apache.logging.log4j.LogManager" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page errorPage="/Error.jsp" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
index 91a8e2f1e..6bb96f7ad 100644
--- a/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp b/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp
index 716d8ec80..5f807a051 100644
--- a/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.api.Release" %>
<fmt:setLocale value="${prefs.Language}" />
diff --git a/jspwiki-war/src/main/webapp/templates/210/FindContent.jsp b/jspwiki-war/src/main/webapp/templates/210/FindContent.jsp
index 0ceebc311..a2243e732 100644
--- a/jspwiki-war/src/main/webapp/templates/210/FindContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/FindContent.jsp
@@ -23,9 +23,9 @@
<%@ page import="java.util.*" %>
<%@ page import="org.apache.commons.lang3.*" %>
<%@ page import="java.net.URLEncoder" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/210/Footer.jsp b/jspwiki-war/src/main/webapp/templates/210/Footer.jsp
index c48c0f59b..4979c252b 100644
--- a/jspwiki-war/src/main/webapp/templates/210/Footer.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/Footer.jsp
@@ -18,10 +18,10 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="org.apache.wiki.api.Release" %>
<%@ page import="org.apache.wiki.api.core.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp b/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
index 1f37656b1..8561d42a7 100644
--- a/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="java.security.Principal" %>
<%@ page import="java.util.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
@@ -30,7 +30,7 @@
<%@ page import="org.apache.logging.log4j.Logger" %>
<%@ page import="org.apache.logging.log4j.LogManager" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
diff --git a/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp b/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
index df106512a..a22d1bc89 100644
--- a/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
@@ -21,7 +21,7 @@
<%@ page import="java.security.Principal" %>
<%@ page import="java.text.MessageFormat" %>
<%@ page import="java.util.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.Context" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.authorize.Group" %>
@@ -31,7 +31,7 @@
<%@ page import="org.apache.logging.log4j.Logger" %>
<%@ page import="org.apache.logging.log4j.LogManager" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
diff --git a/jspwiki-war/src/main/webapp/templates/210/Header.jsp b/jspwiki-war/src/main/webapp/templates/210/Header.jsp
index b479bb199..a1b23ce18 100644
--- a/jspwiki-war/src/main/webapp/templates/210/Header.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/Header.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp b/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp
index 1f692c6e4..53e2f6a04 100644
--- a/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/InfoContent.jsp
@@ -19,7 +19,7 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.security.Permission" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.AttachmentManager" %>
<%@ page import="org.apache.wiki.auth.*" %>
@@ -29,8 +29,8 @@
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.ui.progress.ProgressManager" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/LoginContent.jsp b/jspwiki-war/src/main/webapp/templates/210/LoginContent.jsp
index f0fd85df8..6de00fa17 100644
--- a/jspwiki-war/src/main/webapp/templates/210/LoginContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/LoginContent.jsp
@@ -21,9 +21,9 @@
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/NewGroupContent.jsp b/jspwiki-war/src/main/webapp/templates/210/NewGroupContent.jsp
index 15aa8263d..618bc8c21 100644
--- a/jspwiki-war/src/main/webapp/templates/210/NewGroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/NewGroupContent.jsp
@@ -27,8 +27,8 @@
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.util.comparators.PrincipalComparator" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/PageActionsBottom.jsp b/jspwiki-war/src/main/webapp/templates/210/PageActionsBottom.jsp
index 483032d18..712e8c8c4 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PageActionsBottom.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PageActionsBottom.jsp
@@ -19,8 +19,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.api.core.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/PageActionsTop.jsp b/jspwiki-war/src/main/webapp/templates/210/PageActionsTop.jsp
index b9072db5d..4a44b41bb 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PageActionsTop.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PageActionsTop.jsp
@@ -19,8 +19,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.api.core.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<div id="actionsTop" class="pageactions">
diff --git a/jspwiki-war/src/main/webapp/templates/210/PageContent.jsp b/jspwiki-war/src/main/webapp/templates/210/PageContent.jsp
index fdc40a788..75863597b 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PageContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PageContent.jsp
@@ -18,10 +18,10 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/PageTab.jsp b/jspwiki-war/src/main/webapp/templates/210/PageTab.jsp
index ebe8ff003..6cfa4e673 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PageTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PageTab.jsp
@@ -22,8 +22,8 @@
<%@ page import="org.apache.wiki.api.providers.WikiProvider" %>
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed --%>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed --%>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/PreferencesContent.jsp b/jspwiki-war/src/main/webapp/templates/210/PreferencesContent.jsp
index d146582ff..56c7a605d 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PreferencesContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PreferencesContent.jsp
@@ -20,8 +20,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/PreferencesTab.jsp b/jspwiki-war/src/main/webapp/templates/210/PreferencesTab.jsp
index de28e1e70..d4c347305 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PreferencesTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PreferencesTab.jsp
@@ -25,11 +25,11 @@
<%@ page import="org.apache.wiki.preferences.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/PreviewContent.jsp b/jspwiki-war/src/main/webapp/templates/210/PreviewContent.jsp
index 5a49bbf1a..144c2f412 100644
--- a/jspwiki-war/src/main/webapp/templates/210/PreviewContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/PreviewContent.jsp
@@ -19,8 +19,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/210/ProfileTab.jsp b/jspwiki-war/src/main/webapp/templates/210/ProfileTab.jsp
index 2605a5913..bb142d0f3 100644
--- a/jspwiki-war/src/main/webapp/templates/210/ProfileTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/ProfileTab.jsp
@@ -22,9 +22,9 @@
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.user.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/SearchBox.jsp b/jspwiki-war/src/main/webapp/templates/210/SearchBox.jsp
index 005eb8a46..7e4a898b1 100644
--- a/jspwiki-war/src/main/webapp/templates/210/SearchBox.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/SearchBox.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%-- Provides a simple searchbox that can be easily included anywhere on the page --%>
diff --git a/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp
index 04f091716..33abed2e8 100644
--- a/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp
@@ -18,10 +18,10 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.AttachmentManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/210/UserBox.jsp b/jspwiki-war/src/main/webapp/templates/210/UserBox.jsp
index d2d8c0e29..f06ad1ba5 100644
--- a/jspwiki-war/src/main/webapp/templates/210/UserBox.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/UserBox.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp
index 8decfc2f6..c2c916588 100644
--- a/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<fmt:setBundle basename="templates.default"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/jspwiki-war/src/main/webapp/templates/210/WorkflowContent.jsp b/jspwiki-war/src/main/webapp/templates/210/WorkflowContent.jsp
index c311f4f8d..40abd78f1 100644
--- a/jspwiki-war/src/main/webapp/templates/210/WorkflowContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/WorkflowContent.jsp
@@ -20,9 +20,9 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<script language="JavaScript">
diff --git a/jspwiki-war/src/main/webapp/templates/210/admin/UserManagement.jsp b/jspwiki-war/src/main/webapp/templates/210/admin/UserManagement.jsp
index 8dbc8e2de..10cd82ae3 100644
--- a/jspwiki-war/src/main/webapp/templates/210/admin/UserManagement.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/admin/UserManagement.jsp
@@ -22,8 +22,8 @@
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<script>
diff --git a/jspwiki-war/src/main/webapp/templates/210/commonheader.jsp b/jspwiki-war/src/main/webapp/templates/210/commonheader.jsp
index 346090133..4de3c0f36 100644
--- a/jspwiki-war/src/main/webapp/templates/210/commonheader.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/commonheader.jsp
@@ -23,8 +23,8 @@
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="java.util.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp
index d4bac805b..ea787af37 100644
--- a/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp
@@ -31,8 +31,8 @@
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp
index 67285cc75..6f3775eef 100644
--- a/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp
@@ -31,8 +31,8 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp
index 008876c7e..36f6ca647 100644
--- a/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp
@@ -30,8 +30,8 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp
index ae0dcf5af..98adbe809 100644
--- a/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp
@@ -27,8 +27,8 @@
<%@ page import="org.apache.wiki.tags.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/preview.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/preview.jsp
index 9a2a47ed3..36f84c7f3 100644
--- a/jspwiki-war/src/main/webapp/templates/210/editors/preview.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/editors/preview.jsp
@@ -23,8 +23,8 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.filters.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp
index e49ec3b77..77d7a5688 100644
--- a/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp
@@ -27,8 +27,8 @@
<%@ page import="org.apache.wiki.tags.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp b/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
index 3b73473dc..060c11be4 100644
--- a/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
@@ -26,7 +26,7 @@
<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<%!
public void jspInit()
{
diff --git a/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp b/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
index 17db8c557..446856ec5 100644
--- a/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
@@ -33,9 +33,9 @@
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.search.SearchManager" %>
<%@ page import="org.apache.wiki.ui.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
diff --git a/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp b/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
index 29016589c..cb56e01c0 100644
--- a/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
@@ -23,9 +23,9 @@
<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ page import="java.security.Permission" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp b/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
index b8037c15c..deac58b4b 100644
--- a/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
@@ -18,9 +18,9 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp b/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
index d1569c65c..4d5a24338 100644
--- a/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<div class="page-content prettify">
diff --git a/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp b/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
index 15ff22357..7cca009e0 100644
--- a/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
@@ -18,13 +18,13 @@
--%>
<%@ page import="java.util.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp b/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
index df126a989..ab7adf696 100644
--- a/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%-- Inserts a string message. --%>
diff --git a/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp b/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
index 2b8251308..0543e628b 100644
--- a/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
@@ -19,9 +19,9 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.api.core.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp b/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
index 0092da87f..efccd99b3 100644
--- a/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
@@ -26,10 +26,10 @@
<%@ page import="org.apache.wiki.util.comparators.PrincipalComparator" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
index 87cb3a2e7..58907caba 100644
--- a/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<!doctype html>
diff --git a/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp b/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
index fae834803..892a44653 100644
--- a/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
@@ -22,9 +22,9 @@
<%@ page import="java.util.*" %>
<%@ page import="org.apache.commons.lang3.*" %>
<%@ page import="java.net.URLEncoder" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<div class="page-content">
diff --git a/jspwiki-war/src/main/webapp/templates/default/Footer.jsp b/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
index a3ee5298c..ab121baaf 100644
--- a/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
@@ -18,9 +18,9 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="org.apache.wiki.api.Release" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<div class="footer">
diff --git a/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp b/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
index c3a521266..d7de1135f 100644
--- a/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
@@ -32,9 +32,9 @@
<%@ page import="org.apache.wiki.util.comparators.PrincipalComparator" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/Header.jsp b/jspwiki-war/src/main/webapp/templates/default/Header.jsp
index 51fc9c608..535d78b63 100644
--- a/jspwiki-war/src/main/webapp/templates/default/Header.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/Header.jsp
@@ -18,9 +18,9 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp b/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
index 1bef92283..408789c3a 100644
--- a/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
@@ -28,10 +28,10 @@
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="java.security.Permission" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp b/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
index 4b8cfadbe..4c64fa001 100644
--- a/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
@@ -21,9 +21,9 @@
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/Nav.jsp b/jspwiki-war/src/main/webapp/templates/default/Nav.jsp
index 8fbe54970..6719a7abb 100644
--- a/jspwiki-war/src/main/webapp/templates/default/Nav.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/Nav.jsp
@@ -18,15 +18,15 @@
--%>
<%@ page import="java.util.StringTokenizer" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.*" %>
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp b/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
index 0cd0da3ec..49de0eb36 100644
--- a/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
@@ -20,8 +20,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.attachment.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/PageInfo.jsp b/jspwiki-war/src/main/webapp/templates/default/PageInfo.jsp
index 0cac982ce..e21950bf6 100644
--- a/jspwiki-war/src/main/webapp/templates/default/PageInfo.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/PageInfo.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp b/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
index 8e7660a2b..01e9cb43c 100644
--- a/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
@@ -22,9 +22,9 @@
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp b/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
index 23fe6b12d..fd7c4494f 100644
--- a/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
@@ -20,9 +20,9 @@
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp b/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
index 4da7bbb17..0d08b9372 100644
--- a/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
@@ -21,14 +21,14 @@
<%@ page import="java.io.*" %>
<%@ page import="java.util.*" %>
<%@ page import="java.util.jar.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.preferences.*" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp b/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
index 4144339d6..aedb474b2 100644
--- a/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
@@ -19,8 +19,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp b/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
index d58b051a3..e236c85c9 100644
--- a/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
@@ -22,9 +22,9 @@
<%@ page import="org.apache.wiki.auth.user.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
diff --git a/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp b/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
index 53df644a2..d4274eb59 100644
--- a/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%-- Provides a simple searchbox --%>
diff --git a/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp b/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp
index fd79e854b..1f9e00a08 100644
--- a/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp
@@ -18,9 +18,9 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%@ page import="org.apache.wiki.api.core.*" %>
diff --git a/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
index 1b3f00829..bd7830a55 100644
--- a/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
@@ -19,9 +19,9 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.api.core.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<!doctype html>
diff --git a/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp b/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
index 4b7ab6c63..7f4548e66 100644
--- a/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
@@ -18,9 +18,9 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
index 50c902d7b..dec94b788 100644
--- a/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
@@ -18,8 +18,8 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="org.apache.wiki.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp b/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
index 280b86454..eb900474c 100644
--- a/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
@@ -20,10 +20,10 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<div class="page-content table-filter-sort">
diff --git a/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp b/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
index 30217d23c..87b70d899 100644
--- a/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
@@ -22,8 +22,8 @@
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<script>
diff --git a/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp b/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
index 5539cb90d..f1aba997f 100644
--- a/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
@@ -23,8 +23,8 @@
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="java.util.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp
index 6a973858f..4899c1387 100644
--- a/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp
@@ -30,9 +30,9 @@
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp
index ec156fa62..29a161c67 100644
--- a/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp
@@ -30,9 +30,9 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
index 0187b60db..f1151018c 100644
--- a/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
@@ -27,9 +27,9 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
index 1baf06904..467000318 100644
--- a/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
@@ -23,8 +23,8 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.filters.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
index 2c4617a50..b4b011622 100644
--- a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
@@ -30,9 +30,9 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.variables.VariableManager" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<wiki:RequestResource type="stylesheet" resource="templates/default/haddock-wysiwyg.css" />
diff --git a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
index fc28259b4..79ce7a43d 100644
--- a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
@@ -18,7 +18,7 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-wikipages/de/pom.xml b/jspwiki-wikipages/de/pom.xml
index 626803f30..b300a544d 100644
--- a/jspwiki-wikipages/de/pom.xml
+++ b/jspwiki-wikipages/de/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/en/pom.xml b/jspwiki-wikipages/en/pom.xml
index 836f264bf..24ac1a0e1 100644
--- a/jspwiki-wikipages/en/pom.xml
+++ b/jspwiki-wikipages/en/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/es/pom.xml b/jspwiki-wikipages/es/pom.xml
index 0299d0c3f..7f7d2c573 100644
--- a/jspwiki-wikipages/es/pom.xml
+++ b/jspwiki-wikipages/es/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fi/pom.xml b/jspwiki-wikipages/fi/pom.xml
index 31bc703ff..9ca1c869d 100644
--- a/jspwiki-wikipages/fi/pom.xml
+++ b/jspwiki-wikipages/fi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fr/pom.xml b/jspwiki-wikipages/fr/pom.xml
index 9de9fd497..15c72c283 100644
--- a/jspwiki-wikipages/fr/pom.xml
+++ b/jspwiki-wikipages/fr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/it/pom.xml b/jspwiki-wikipages/it/pom.xml
index 0d75f538c..2b98427a3 100644
--- a/jspwiki-wikipages/it/pom.xml
+++ b/jspwiki-wikipages/it/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/nl/pom.xml b/jspwiki-wikipages/nl/pom.xml
index d27a5dc65..3ce486d99 100644
--- a/jspwiki-wikipages/nl/pom.xml
+++ b/jspwiki-wikipages/nl/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pom.xml b/jspwiki-wikipages/pom.xml
index 007d7b58b..cd860dbc8 100644
--- a/jspwiki-wikipages/pom.xml
+++ b/jspwiki-wikipages/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pt_BR/pom.xml b/jspwiki-wikipages/pt_BR/pom.xml
index ac65f4c18..be73358ae 100644
--- a/jspwiki-wikipages/pt_BR/pom.xml
+++ b/jspwiki-wikipages/pt_BR/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/ru/pom.xml b/jspwiki-wikipages/ru/pom.xml
index 14def94b6..2b56946c5 100644
--- a/jspwiki-wikipages/ru/pom.xml
+++ b/jspwiki-wikipages/ru/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/zh_CN/pom.xml b/jspwiki-wikipages/zh_CN/pom.xml
index 2a75eb804..61b092462 100644
--- a/jspwiki-wikipages/zh_CN/pom.xml
+++ b/jspwiki-wikipages/zh_CN/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wysiwyg/pom.xml b/jspwiki-wysiwyg/pom.xml
index 65f72919e..b4a1db45a 100644
--- a/jspwiki-wysiwyg/pom.xml
+++ b/jspwiki-wysiwyg/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,6 +35,13 @@
<artifactId>jspwiki-api</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -51,11 +58,17 @@
<artifactId>nekohtml</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
+
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+<dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index 333d62d21..b85093ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>jspwiki-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>Apache JSPWiki</name>
- <version>2.12.4-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard JEE components (Java, servlets, JSP).</description>
@@ -77,8 +77,8 @@
<selenide.version>6.19.0</selenide.version>
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
- <tika.version>3.2.1</tika.version>
- <tomcat.version>9.0.107</tomcat.version>
+ <tika.version>3.2.3</tika.version>
+ <tomcat.version>10.1.46</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
<xstream.version>1.4.21</xstream.version>
@@ -86,12 +86,12 @@
<plugin.antrun.version>3.1.0</plugin.antrun.version>
<plugin.assembly.version>3.7.1</plugin.assembly.version>
<plugin.clean.version>3.5.0</plugin.clean.version>
- <plugin.compiler.version>3.14.0</plugin.compiler.version>
+ <plugin.compiler.version>3.14.1</plugin.compiler.version>
<plugin.dependency.version>3.8.1</plugin.dependency.version>
<plugin.enforcer.version>3.6.1</plugin.enforcer.version>
<plugin.install.version>3.1.4</plugin.install.version>
<plugin.jar.version>3.4.2</plugin.jar.version>
- <plugin.javadoc.version>3.11.1</plugin.javadoc.version>
+ <plugin.javadoc.version>3.12.0</plugin.javadoc.version>
<plugin.jxr.version>3.6.0</plugin.jxr.version>
<plugin.project-info-reports.version>3.9.0</plugin.project-info-reports.version>
<plugin.release.version>3.1.1</plugin.release.version>
@@ -138,7 +138,7 @@
<module>jspwiki-markdown</module>
<module>jspwiki-tika-searchprovider</module>
<module>jspwiki-kendra-searchprovider</module>
- <module>jspwiki-210-test-adaptees</module>
+<!-- <module>jspwiki-210-test-adaptees</module> -->
<module>jspwiki-210-adapters</module>
<module>jspwiki-war</module>
<module>jspwiki-portable</module>
@@ -147,7 +147,102 @@
</modules>
<dependencyManagement> <!-- defines what configuration is going to be used if, and only if, the dependency is used -->
- <dependencies> <!-- ordered alphabetically by scope:groupId:artifactId -->
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-event</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-cache</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-wysiwyg</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-markdown</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-kendra-searchprovider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-main</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-210-adapters</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-210-adapters</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-210-test-adaptees</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <!-- ordered alphabetically by scope:groupId:artifactId -->
<!-- compile dependencies -->
<dependency>
<groupId>com.amazonaws</groupId>
@@ -167,11 +262,13 @@
<version>${javax-mail.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>${javax-mail.version}</version>
- </dependency>
+
+<dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>2.1.3</version>
+</dependency>
+
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -214,12 +311,19 @@
<artifactId>flexmark-ext-toc</artifactId>
<version>${flexmark.version}</version>
</dependency>
-
+<!--
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
</dependency>
+-->
+<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ <version>2.0.0-M2</version>
+</dependency>
+
<dependency>
<groupId>commons-httpclient</groupId>
@@ -275,12 +379,6 @@
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>${javax-jstl.version}</version>
- </dependency>
-
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -402,11 +500,13 @@
</dependency>
<!-- test dependencies -->
- <dependency>
- <groupId>net.sourceforge.stripes</groupId>
- <artifactId>stripes</artifactId>
- <version>${stripes.version}</version>
- </dependency>
+
+<dependency>
+ <groupId>net.sourceforge.stripes</groupId>
+ <artifactId>stripes</artifactId>
+ <version>1.6.0</version>
+</dependency>
+
<dependency>
<groupId>com.github.jbellis</groupId>
@@ -455,18 +555,35 @@
<scope>import</scope>
</dependency>
- <!-- provided dependencies -->
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>${javax-jsp-api.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api.version}</version>
- </dependency>
+
+<dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+</dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <version>4.0.0</version>
+</dependency>
+
+<dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.2</version>
+</dependency>
+
+
+<dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <version>3.0.1</version>
+</dependency>
+
+
+
</dependencies>
</dependencyManagement>