diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 33a5a32c..1c471196 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -13,7 +13,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
- java-version: 11
+ java-version: 17
distribution: temurin
- name: Cache Local Maven Repository
diff --git a/README.md b/README.md
index 614065ce..4bfd9cfc 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ WiQuery consists of 3 subprojects:
WiQuery requires the following:
- Java 8
-- Servlet 3.1
-- Wicket 8.0 or newer
+- Servlet 5.0
+- Wicket 10 or newer
Newer or older major releases of Wicket are not compatible with this version of WiQuery.
diff --git a/pom.xml b/pom.xml
index 49783bbb..2bc44116 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.wicketstuff.wiquery
wiquery-parent
pom
- 9.1.0-SNAPSHOT
+ 10.0.0-M2-SNAPSHOT
WiQuery Parent
@@ -60,12 +60,12 @@
11
11
- 9.16.0
+ 10.0.0-M2
2.16.1
2.0.12
5.10.2
- 4.0.4
- 9.4.54.v20240208
+ 5.0.0
+ 11.0.20
1.7.14
@@ -303,7 +303,6 @@
3.6.3
UTF-8
- -Xdoclint:none
diff --git a/wiquery-core/pom.xml b/wiquery-core/pom.xml
index 0b084729..6c38660c 100644
--- a/wiquery-core/pom.xml
+++ b/wiquery-core/pom.xml
@@ -4,7 +4,7 @@
org.wicketstuff.wiquery
wiquery-parent
- 9.1.0-SNAPSHOT
+ 10.0.0-M2-SNAPSHOT
../pom.xml
wiquery-core
@@ -22,6 +22,13 @@
+
+ org.apache.wicket
+ wicket-tester
+ ${wicket.version}
+ test
+
+
org.junit.jupiter
junit-jupiter-engine
diff --git a/wiquery-core/src/main/java/org/wicketstuff/wiquery/core/util/WiQueryUtil.java b/wiquery-core/src/main/java/org/wicketstuff/wiquery/core/util/WiQueryUtil.java
index ca88698f..b3739b06 100644
--- a/wiquery-core/src/main/java/org/wicketstuff/wiquery/core/util/WiQueryUtil.java
+++ b/wiquery-core/src/main/java/org/wicketstuff/wiquery/core/util/WiQueryUtil.java
@@ -52,7 +52,7 @@ public static ResourceReference getJQueryResourceReference()
}
else
{
- reference = JQueryResourceReference.getV1();
+ reference = JQueryResourceReference.getV3();
}
return reference;
}
diff --git a/wiquery-demo/pom.xml b/wiquery-demo/pom.xml
index c7986c80..35577be9 100644
--- a/wiquery-demo/pom.xml
+++ b/wiquery-demo/pom.xml
@@ -1,10 +1,11 @@
-
+
4.0.0
wiquery-parent
org.wicketstuff.wiquery
- 9.1.0-SNAPSHOT
+ 10.0.0-M2-SNAPSHOT
../pom.xml
@@ -25,6 +26,12 @@
+
+ org.apache.wicket
+ wicket-tester
+ ${wicket.version}
+ test
+
org.junit.jupiter
junit-jupiter-engine
@@ -44,13 +51,14 @@
org.eclipse.jetty
- jetty-plus
+ jetty-server
${jetty.version}
test
- jakarta.servlet
- jakarta.servlet-api
+ org.eclipse.jetty
+ jetty-webapp
+ ${jetty.version}
test
diff --git a/wiquery-demo/src/test/java/org/wicketstuff/wiquery/Start.java b/wiquery-demo/src/test/java/org/wicketstuff/wiquery/Start.java
index 87ac01d5..4588ba85 100644
--- a/wiquery-demo/src/test/java/org/wicketstuff/wiquery/Start.java
+++ b/wiquery-demo/src/test/java/org/wicketstuff/wiquery/Start.java
@@ -14,7 +14,6 @@ public static void main(String[] args)
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
// Set some timeout options to make debugging easier.
connector.setIdleTimeout(1000 * 60 * 60);
- connector.setSoLingerTime(-1);
connector.setPort(8080);
server.setConnectors(new Connector[] { connector });
diff --git a/wiquery-jquery-ui/pom.xml b/wiquery-jquery-ui/pom.xml
index 978e2bd6..436214d5 100644
--- a/wiquery-jquery-ui/pom.xml
+++ b/wiquery-jquery-ui/pom.xml
@@ -4,7 +4,7 @@
org.wicketstuff.wiquery
wiquery-parent
- 9.1.0-SNAPSHOT
+ 10.0.0-M2-SNAPSHOT
../pom.xml
wiquery-jquery-ui
@@ -31,6 +31,12 @@
+
+ org.apache.wicket
+ wicket-tester
+ ${wicket.version}
+ test
+
org.junit.jupiter
junit-jupiter-engine