"bootique-tapestry59-jakarta" module #29

bootique · Nov 5, 2024 · ab42ff2 · ab42ff2
1 parent 09b77e8
commit ab42ff2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/bootique-tapestry59-jakarta/pom.xml b/bootique-tapestry59-jakarta/pom.xml
@@ -30,16 +30,27 @@
 	<artifactId>bootique-tapestry59-jakarta</artifactId>
 	<packaging>jar</packaging>
 
-	<name>bootique-tapestry58: Apache Tapestry Jakarta 5.9.x Integration for Bootique</name>
+	<name>bootique-tapestry59: Apache Tapestry Jakarta 5.9.x Integration for Bootique</name>
 	<description>
 		Provides Apache Tapestry 5.9.x Jakarta integration with Bootique.
 	</description>
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>io.bootique.jetty</groupId>
+				<artifactId>bootique-jetty-jakarta</artifactId>
+				<version>${bootique.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.bootique.jetty</groupId>
+				<artifactId>bootique-jetty-jakarta-junit5</artifactId>
+				<version>${bootique.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.apache.tapestry</groupId>
-				<artifactId>tapestry-core</artifactId>
+				<artifactId>tapestry-core-jakarta</artifactId>
 				<version>${tapestry59.version}</version>
 				<exclusions>
 					<exclusion>
@@ -77,11 +88,11 @@
 		</dependency>
 		<dependency>
 			<groupId>io.bootique.jetty</groupId>
-			<artifactId>bootique-jetty</artifactId>
+			<artifactId>bootique-jetty-jakarta</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
-			<artifactId>tapestry-core</artifactId>
+			<artifactId>tapestry-core-jakarta</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.woodstox</groupId>
@@ -109,8 +120,8 @@
 		</dependency>
 		<dependency>
 			<groupId>io.bootique.jetty</groupId>
-			<artifactId>bootique-jetty-junit5</artifactId>
-			<version>${bootique.version}</version>
+			<artifactId>bootique-jetty-jakarta-junit5</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

diff --git a/...ue-tapestry59-jakarta/src/main/java/io/bootique/tapestry/v59/filter/BQTapestryFilter.java b/...ue-tapestry59-jakarta/src/main/java/io/bootique/tapestry/v59/filter/BQTapestryFilter.java
@@ -19,6 +19,9 @@
 
 package io.bootique.tapestry.v59.filter;
 
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.tapestry5.TapestryFilter;
 import org.apache.tapestry5.http.AsyncRequestHandlerResponse;
 import org.apache.tapestry5.http.TapestryHttpSymbolConstants;
@@ -34,9 +37,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

diff --git a/bootique-tapestry59-jakarta/src/test/java/io/bootique/tapestry/TapestryModuleIT.java b/bootique-tapestry59-jakarta/src/test/java/io/bootique/tapestry/TapestryModuleIT.java
@@ -26,12 +26,11 @@
 import io.bootique.junit5.BQTestTool;
 import io.bootique.tapestry.v59.TapestryModule;
 import io.bootique.tapestry.v59.testapp2.bq.TestApp2BootiqueModule;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.apache.tapestry5.services.LibraryMapping;
 import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;