Merge pull request #35 from renoth/master

Update to Wicket 10 / Jakarta EE 10
wicketstuff · Mar 5, 2024 · ed72d4f · ed72d4f
2 parents 3be83c8 + 05955d6
commit ed72d4f
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 17 deletions.
diff --git 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
@@ -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
@@ -14,7 +14,7 @@
 	<groupId>org.wicketstuff.wiquery</groupId>
 	<artifactId>wiquery-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>9.1.0-SNAPSHOT</version>
+	<version>10.0.0-M2-SNAPSHOT</version>
 	<name>WiQuery Parent</name>
 
 	<licenses>
@@ -60,12 +60,12 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.source>11</maven.compiler.source>
 
-		<wicket.version>9.16.0</wicket.version>
+		<wicket.version>10.0.0-M2</wicket.version>
 		<jackson.version>2.16.1</jackson.version>
 		<slf4j.version>2.0.12</slf4j.version>
 		<junit.version>5.10.2</junit.version>
-		<servlet-api.version>4.0.4</servlet-api.version>
-		<jetty.version>9.4.54.v20240208</jetty.version>
+		<servlet-api.version>5.0.0</servlet-api.version>
+		<jetty.version>11.0.20</jetty.version>
 		<rhino.version>1.7.14</rhino.version>
 	</properties>
 
@@ -303,7 +303,6 @@
 					<version>3.6.3</version>
 					<configuration>
 						<encoding>UTF-8</encoding>
-						<additionalparam>-Xdoclint:none</additionalparam>
 					</configuration>
 				</plugin>
 				<plugin>

diff --git a/wiquery-core/pom.xml b/wiquery-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.wicketstuff.wiquery</groupId>
 		<artifactId>wiquery-parent</artifactId>
-		<version>9.1.0-SNAPSHOT</version>
+		<version>10.0.0-M2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wiquery-core</artifactId>
@@ -22,6 +22,13 @@
 		</dependency>
 
 		<!-- Test dependencies -->
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-tester</artifactId>
+			<version>${wicket.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>

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
@@ -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
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>wiquery-parent</artifactId>
 		<groupId>org.wicketstuff.wiquery</groupId>
-		<version>9.1.0-SNAPSHOT</version>
+		<version>10.0.0-M2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -25,6 +26,12 @@
 		</dependency>
 
 		<!-- Test dependencies -->
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-tester</artifactId>
+			<version>${wicket.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
@@ -44,13 +51,14 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-plus</artifactId>
+			<artifactId>jetty-server</artifactId>
 			<version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git 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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.wicketstuff.wiquery</groupId>
 		<artifactId>wiquery-parent</artifactId>
-		<version>9.1.0-SNAPSHOT</version>
+		<version>10.0.0-M2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wiquery-jquery-ui</artifactId>
@@ -31,6 +31,12 @@
 		</dependency>
 
 		<!-- Test dependencies -->
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-tester</artifactId>
+			<version>${wicket.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ public static ResourceReference getJQueryResourceReference() @@
     		}
     		else
     		{
-    			reference = JQueryResourceReference.getV1();
+    			reference = JQueryResourceReference.getV3();
     		}
     		return reference;
     	}
@@ Expand Down @@