diff --git a/.classpath b/.classpath
index d2a1cd5..55e6224 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
@@ -19,9 +18,16 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/pom.xml b/pom.xml
index 008295b..62851be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,12 +19,14 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.target>11</maven.compiler.target>
 	</properties>
 
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</developerConnection>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</developerConnection>
 		<url>https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</url>
 	</scm>
 
@@ -43,10 +45,8 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/org/gcube/smartgears/ContextListener.java b/src/main/java/org/gcube/smartgears/ContextListener.java
index ada0dad..1a0f65d 100644
--- a/src/main/java/org/gcube/smartgears/ContextListener.java
+++ b/src/main/java/org/gcube/smartgears/ContextListener.java
@@ -4,9 +4,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.gcube.smartgears.application.manager.AppManagerObserver;
@@ -81,7 +81,7 @@ public class ContextListener implements ServletContextListener {
 			context.events().subscribe(observer);
 		}
 		else {
-			log.info("no application managers faound for {}",context.name());
+			log.info("no application managers found for {}",context.name());
 		}
 	}
 
diff --git a/src/main/java/org/gcube/smartgears/ContextProvider.java b/src/main/java/org/gcube/smartgears/ContextProvider.java
index a893f5e..46f3598 100644
--- a/src/main/java/org/gcube/smartgears/ContextProvider.java
+++ b/src/main/java/org/gcube/smartgears/ContextProvider.java
@@ -1,6 +1,6 @@
 package org.gcube.smartgears;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.gcube.common.events.Hub;
 import org.gcube.smartgears.configuration.application.ApplicationConfiguration;