not working b/c wicket reliance on javax
diff --git a/README.md b/README.md
index 9a8752f..2068c20 100644
--- a/README.md
+++ b/README.md
@@ -78,13 +78,13 @@
## SECTION 1. Prerequisites
Minimum software requirements:
- * Java SDK 11++
* git
- * Apache Maven3++
- * Apache Tomcat8++
+ * Java SDK >= 17
+ * Apache Maven >= 3
+ * Apache Tomcat >= 8 and < 10
* LDAP server on the network, configured for Apache Fortress usage.
-Everything else covered in the steps that follow. Tested on Debian & Centos systems.
+Everything else covered in the steps that follow. Tested on Debian and Redhat systems.
-------------------------------------------------------------------------------
## SECTION 2. Download & Install Apache Fortress Web
diff --git a/pom.xml b/pom.xml
index 4584990..0f59270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,12 +78,12 @@
<properties>
<title>${project.name} ${project.version}</title>
- <java.version>11</java.version>
- <fortress.realm.version>2.0.8</fortress.realm.version>
+ <java.version>17</java.version>
+ <fortress.realm.version>2.0.9-SNAPSHOT</fortress.realm.version>
<wicket.version>9.13.0</wicket.version>
<wicket.googlecode.version>9.12.0</wicket.googlecode.version>
<version.ant>1.10.13</version.ant>
- <spring.security.version>5.8.3</spring.security.version>
+ <spring.security.version>6.0.3</spring.security.version>
<javadoc.version>2.9.1</javadoc.version>
</properties>
@@ -96,9 +96,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
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..1417e0c 100644
--- a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
@@ -23,7 +23,7 @@
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;
/**
* ...
diff --git a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
index 4ae481e..be732d0 100644
--- a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
+++ b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
@@ -96,6 +96,7 @@
baseUrl = "http://localhost:8080";
// remote over TLS:
//baseUrl = "https://fortress-a:8443";
+ baseUrl = "https://fortress-b:8443";
driver.manage().timeouts().implicitlyWait( 5, TimeUnit.SECONDS );
}
