Index: dbLearnStar-webApp/pom.xml
===================================================================
--- dbLearnStar-webApp/pom.xml	(revision f4d124e137a13b90f7b73f82b6079162195cf135)
+++ dbLearnStar-webApp/pom.xml	(revision 44e642ae2c5d49ccce28e6d521395d915106b563)
@@ -1,12 +1,12 @@
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://maven.apache.org/POM/4.0.0">
-
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.18</version>
+		<version>3.1.3</version>
 		<relativePath />
 	</parent>
@@ -14,5 +14,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar</artifactId>
-	<version>0.11.1</version>
+	<version>0.13.0-SNAPSHOT</version>
 	<name>dbLearnStar</name>
 
@@ -36,20 +36,21 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<maven-compiler-version>3.12.1</maven-compiler-version>
-		<maven-surefire-version>3.2.3</maven-surefire-version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
-		<java.version>17</java.version>
-
-		<spring-boot-version>2.7.18</spring-boot-version>
-		<tapestry-version>5.8.7</tapestry-version>
-		<jackson-version>2.13.5</jackson-version>
-		<log4j-version>2.23.0</log4j-version>
-		<junit-version>5.10.2</junit-version>
-		<yasson-version>3.0.3</yasson-version>
-		<servlet-version>4.0.1</servlet-version>
-
-		<postgresql-version>42.7.2</postgresql-version>
-		<cas-client-version>3.6.4</cas-client-version>
+		<maven-compiler-version>3.13.0</maven-compiler-version>
+		<maven-surefire-version>3.5.0</maven-surefire-version>
+		<maven-enforcer-version>3.0.0</maven-enforcer-version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
+		<java.version>21</java.version>
+
+		<spring-boot-version>3.1.3</spring-boot-version>
+		<tapestry-version>5.9.0</tapestry-version>
+		<jackson-version>2.13.1</jackson-version>
+		<log4j-version>2.24.0</log4j-version>
+		<junit-version>5.8.2</junit-version>
+		<yasson-version>2.0.4</yasson-version>
+		<servlet-version>5.0.0</servlet-version>
+
+		<postgresql-version>42.7.4</postgresql-version>
+		<cas-client-version>4.0.4</cas-client-version>
 	</properties>
 
@@ -65,5 +66,5 @@
 			<groupId>dblearnstar</groupId>
 			<artifactId>dblearnstar-model</artifactId>
-			<version>0.0.9-SNAPSHOT</version>
+			<version>0.1.0-SNAPSHOT</version>
 		</dependency>
 
@@ -110,5 +111,5 @@
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
-			<artifactId>tapestry-core</artifactId>
+			<artifactId>tapestry-core-jakarta</artifactId>
 			<version>${tapestry-version}</version>
 			<scope>compile</scope>
@@ -117,5 +118,5 @@
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
-			<artifactId>tapestry-webresources</artifactId>
+			<artifactId>tapestry-webresources-jakarta</artifactId>
 			<version>${tapestry-version}</version>
 			<scope>compile</scope>
@@ -126,5 +127,5 @@
         <dependency>
             <groupId>org.apache.tapestry</groupId>
-            <artifactId>tapestry-spring</artifactId>
+            <artifactId>tapestry-spring-jakarta</artifactId>
             <version>${tapestry-version}</version>
             <scope>compile</scope>
@@ -133,5 +134,5 @@
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
-			<artifactId>tapestry-hibernate</artifactId>
+			<artifactId>tapestry-hibernate-jakarta</artifactId>
 			<version>${tapestry-version}</version>
 			<scope>compile</scope>
@@ -145,5 +146,5 @@
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
-			<artifactId>tapestry-upload</artifactId>
+			<artifactId>tapestry-upload-jakarta</artifactId>
 			<version>${tapestry-version}</version>
 			<scope>compile</scope>
@@ -152,5 +153,5 @@
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
-			<artifactId>tapestry-test</artifactId>
+			<artifactId>tapestry-test-jakarta</artifactId>
 			<version>${tapestry-version}</version>
 			<scope>test</scope>
@@ -200,6 +201,6 @@
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet-version}</version>
 			<scope>provided</scope>
@@ -212,21 +213,32 @@
 			<version>${postgresql-version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>5.1.0</version>
-		</dependency>
-
+			<version>6.2.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-hikaricp</artifactId>
-			<version>5.6.15.Final</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jasig.cas.client</groupId>
+			<version>5.4.33.Final</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apereo.cas.client</groupId>
 			<artifactId>cas-client-core</artifactId>
 			<version>${cas-client-version}</version>
+		</dependency>
+
+		<!-- jaxb for error -->
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>2.3.3</version>
+		</dependency>
+		<!-- Runtime, com.sun.xml.bind module -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.9</version>
 		</dependency>
 
@@ -252,5 +264,5 @@
 			<groupId>org.webjars</groupId>
 			<artifactId>webjars-locator</artifactId>
-			<version>0.48</version>
+			<version>0.52</version>
 		</dependency>
 		<dependency>
@@ -292,4 +304,14 @@
 		</dependency>
 	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.hibernate.orm</groupId>
+				<artifactId>hibernate-core</artifactId>
+				<version>5.4.33.Final</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<build>
@@ -357,5 +379,5 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>${maven-enforcer-version}</version>
 				<executions>
 					<execution>
@@ -464,6 +486,5 @@
 									<fileMappers>
 										<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
-											<pattern>
-												^\QMETA-INF/resources/webjars/codemirror/6.65.7/\E</pattern>
+											<pattern>^\QMETA-INF/resources/webjars/codemirror/6.65.7/\E</pattern>
 											<replacement>./</replacement>
 										</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/AppConfiguration.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/AppConfiguration.java	(revision f4d124e137a13b90f7b73f82b6079162195cf135)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/AppConfiguration.java	(revision 44e642ae2c5d49ccce28e6d521395d915106b563)
@@ -23,15 +23,10 @@
 import java.util.EnumSet;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.SessionTrackingMode;
-
 import org.apache.tapestry5.TapestryFilter;
-import org.jasig.cas.client.authentication.AuthenticationFilter;
-import org.jasig.cas.client.session.SingleSignOutFilter;
-import org.jasig.cas.client.session.SingleSignOutHttpSessionListener;
-import org.jasig.cas.client.util.HttpServletRequestWrapperFilter;
-import org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter;
+import org.apereo.cas.client.authentication.AuthenticationFilter;
+import org.apereo.cas.client.session.SingleSignOutFilter;
+import org.apereo.cas.client.session.SingleSignOutHttpSessionListener;
+import org.apereo.cas.client.util.HttpServletRequestWrapperFilter;
+import org.apereo.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.ErrorPage;
@@ -45,4 +40,8 @@
 import dblearnstar.webapp.services.UTF8Filter;
 import dblearnstar.webapp.util.AppConfig;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.SessionTrackingMode;
 
 @Configuration
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java	(revision f4d124e137a13b90f7b73f82b6079162195cf135)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java	(revision 44e642ae2c5d49ccce28e6d521395d915106b563)
@@ -36,5 +36,5 @@
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.fileupload.FileUploadException;
@@ -144,16 +144,21 @@
 //	@Persist
 	private TaskInTestInstance taskInTestInstance;
+
 	@Property
 	@Persist
 	private Boolean filterNotForEvalution;
+	
 	@Property
 	@Persist
 	private UploadedFile file;
+	
 	@Property
 	@Persist
 	private String fileComment;
+	
 	@Property
 	@Persist(PersistenceConstants.FLASH)
 	private String message;
+	
 	@Property
 	@Persist(PersistenceConstants.FLASH)
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/UTF8Filter.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/UTF8Filter.java	(revision f4d124e137a13b90f7b73f82b6079162195cf135)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/UTF8Filter.java	(revision 44e642ae2c5d49ccce28e6d521395d915106b563)
@@ -23,10 +23,10 @@
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 public class UTF8Filter implements Filter {