not working
diff --git a/pom.xml b/pom.xml
index 9e3fad8..dd1db2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,8 @@
<properties>
<title>${project.name} ${project.version}</title>
<java.version>11</java.version>
- <fortress.realm.version>2.0.8</fortress.realm.version>
+ <fortress.realm.version>2.0.9-SNAPSHOT</fortress.realm.version>
+<!-- <fortress.realm.version>2.0.8</fortress.realm.version>-->
<wicket.version>9.11.0</wicket.version>
<wicket.googlecode.version>9.8.1</wicket.googlecode.version>
<version.ant>1.10.12</version.ant>
@@ -96,17 +97,71 @@
</dependency>
<dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+<!--
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
+-->
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>6.0.0-M5</version>
+ </dependency>
+
+<!--
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>6.0.0-M5</version>
+ </dependency>
+-->
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>6.0.0-M6</version>
+ <!-- <version>${spring.security.version}</version>-->
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+<!-- <version>${spring.security.version}</version>-->
+ <version>6.0.0-M5</version>
+ </dependency>
<!-- Wicket, Spring and other Web UI framework tools -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
<version>${wicket.version}</version>
+<!--
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ </exclusion>
+ </exclusions>
+-->
</dependency>
<dependency>
@@ -127,18 +182,6 @@
<version>${wicket.googlecode.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
-
<!-- ANT DEPENDENCIES FOR RUNNING ANT PLUG-IN FOR FORTRESS LOAD UTILITY -->
<dependency>
<groupId>org.apache.ant</groupId>
@@ -471,6 +514,12 @@
<id>maven2</id>
<url>https://repo1.maven.org/maven2</url>
</repository>
+ <repository>
+ <id>repository.spring.milestone</id>
+ <name>Spring Milestone Repository</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+
</repositories>
<!-- OWASP Dependency Vulnerability Scanner Profile -->
diff --git a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
index 67354ff..5eda4d4 100644
--- a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
@@ -38,7 +38,7 @@
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.model.Session;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
diff --git a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
index e87f813..54b3cda 100644
--- a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
@@ -20,10 +20,9 @@
package org.apache.directory.fortress.web;
-import org.apache.directory.fortress.web.common.GlobalIds;
import org.apache.wicket.markup.html.basic.Label;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
diff --git a/src/main/java/org/apache/directory/fortress/web/LoginPage.java b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
index fae3792..436e013 100644
--- a/src/main/java/org/apache/directory/fortress/web/LoginPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
@@ -31,8 +31,8 @@
import org.apache.wicket.request.http.handler.RedirectRequestHandler;
import org.apache.directory.fortress.core.util.VUtil;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
diff --git a/src/main/java/org/apache/directory/fortress/web/LogoutPage.java b/src/main/java/org/apache/directory/fortress/web/LogoutPage.java
index ba22a20..5d77793 100644
--- a/src/main/java/org/apache/directory/fortress/web/LogoutPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LogoutPage.java
@@ -24,7 +24,7 @@
import org.slf4j.LoggerFactory;
import org.apache.wicket.markup.html.basic.Label;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java b/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
index 0bafa1b..baf5277 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
@@ -36,7 +36,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.List;
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecureBookmarkablePageLink.java b/src/main/java/org/apache/directory/fortress/web/control/SecureBookmarkablePageLink.java
index 9f73d6c..420e020 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecureBookmarkablePageLink.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecureBookmarkablePageLink.java
@@ -24,7 +24,7 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.StringTokenizer;
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
index 990be4b..b935051 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
@@ -27,7 +27,7 @@
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.model.Permission;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* ...
