diff --git a/.classpath b/.classpath
index 5e8a55f..15c258d 100644
--- a/.classpath
+++ b/.classpath
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -13,14 +23,17 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/pom.xml b/pom.xml
index 04eb1cc..1e944f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,10 @@
 		<distroDirectory>distro</distroDirectory>
 	</properties>
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
 		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
 	<dependencyManagement>
@@ -39,18 +41,20 @@
 			<artifactId>common-gcube-calls</artifactId>
 		</dependency>
 		<dependency>
-          <groupId>com.sun.xml.ws</groupId>
-          <artifactId>jaxws-rt</artifactId>
-          <version>2.3.3</version>
-          <scope>runtime</scope>
-      </dependency>
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>jaxws-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.ws</groupId>
+			<artifactId>jakarta.xml.ws-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.ws</groupId>
+			<artifactId>jaxws-rt</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/src/main/java/org/gcube/common/calls/jaxws/JAXWSUtils.java b/src/main/java/org/gcube/common/calls/jaxws/JAXWSUtils.java
index 7b760ed..85cdebd 100644
--- a/src/main/java/org/gcube/common/calls/jaxws/JAXWSUtils.java
+++ b/src/main/java/org/gcube/common/calls/jaxws/JAXWSUtils.java
@@ -1,6 +1,6 @@
 package org.gcube.common.calls.jaxws;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * Library-wide utilities.
diff --git a/src/main/java/org/gcube/common/calls/jaxws/JaxWSEndpointReference.java b/src/main/java/org/gcube/common/calls/jaxws/JaxWSEndpointReference.java
index a7f36ff..92df29f 100644
--- a/src/main/java/org/gcube/common/calls/jaxws/JaxWSEndpointReference.java
+++ b/src/main/java/org/gcube/common/calls/jaxws/JaxWSEndpointReference.java
@@ -2,13 +2,16 @@ package org.gcube.common.calls.jaxws;
 
 import java.io.StringReader;
 import java.io.StringWriter;
+
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.EndpointReference;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import jakarta.xml.ws.EndpointReference;
+
 public class JaxWSEndpointReference {
 
 	private static final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
diff --git a/src/main/java/org/gcube/common/calls/jaxws/StubFactory.java b/src/main/java/org/gcube/common/calls/jaxws/StubFactory.java
index f0e7396..bdd9dbf 100644
--- a/src/main/java/org/gcube/common/calls/jaxws/StubFactory.java
+++ b/src/main/java/org/gcube/common/calls/jaxws/StubFactory.java
@@ -2,17 +2,18 @@ package org.gcube.common.calls.jaxws;
 
 import java.net.URL;
 import java.util.List;
-import javax.xml.ws.Binding;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.EndpointReference;
-import javax.xml.ws.Service;
-import javax.xml.ws.handler.Handler;
 
 import org.gcube.common.calls.jaxws.handlers.JaxWSHandler;
 import org.gcube.common.calls.jaxws.proxies.GenericProxyFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.xml.ws.Binding;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.EndpointReference;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.handler.Handler;
+
 public class StubFactory<T> implements StubFactoryDSL.AtClause<T>{
 
 	private static Logger log = LoggerFactory.getLogger(StubFactory.class);
diff --git a/src/main/java/org/gcube/common/calls/jaxws/handlers/JaxWSHandler.java b/src/main/java/org/gcube/common/calls/jaxws/handlers/JaxWSHandler.java
index b9901f8..69e57d7 100644
--- a/src/main/java/org/gcube/common/calls/jaxws/handlers/JaxWSHandler.java
+++ b/src/main/java/org/gcube/common/calls/jaxws/handlers/JaxWSHandler.java
@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+
 import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
 
 import org.gcube.common.calls.Interceptors;
 import org.gcube.common.calls.Request;
@@ -17,6 +15,10 @@ import org.gcube.common.calls.jaxws.GcubeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
+
 public class JaxWSHandler implements SOAPHandler<SOAPMessageContext>{
 
 	private Logger logger = LoggerFactory.getLogger(JaxWSHandler.class);