diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cc21f04..fc105e3 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                    
+                                        
+    
     
     
     
@@ -8,7 +9,8 @@
     
     
     <wb-module deploy-name="uri-resolver-2.8.0-SNAPSHOT">
-                                                                        
+                                                                                
+        
         
         
         
@@ -17,7 +19,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                        
+                                                                                
+        
         
         
         
@@ -26,7 +29,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                        
+                                                                                
+        
         
         
         
@@ -35,7 +39,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                        
+                                                                                
+        
         
         
         
@@ -44,7 +49,11 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                        
+        <dependent-module archiveName="uri-resolver-manager-1.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/uri-resolver-manager/uri-resolver-manager">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                
+        
         
         
         
@@ -53,7 +62,8 @@
         
         
         <property name="context-root" value="uri-resolver"/>
-                                                                        
+                                                                                
+        
         
         
         
@@ -62,7 +72,8 @@
         
         
         <property name="java-output-path" value="/uri-resolver/target/classes"/>
-                                                                    
+                                                                            
+    
     
     
     
@@ -71,7 +82,8 @@
     
     
     </wb-module>
-                                
+                                    
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 527e224..f1c2f1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v2.8.0-SNAPSHOT] - 2022-04-20
+## [v2.8.0-SNAPSHOT] - 2022-04-27
 
 **New**
 
 - [#23156] CatalogueResolver enhanced to manage (create/resolve) an input query string
 
+## [v2.7.3-SNAPSHOT] - 2022-04-27
+
+**Bug Fixing**
+
+- [#23213] Fixed NoClassDefFoundError: org/geotoolkit/xml/XML
+
 ## [v2.7.2] - 2022-04-06
 
 **New**
diff --git a/enunciate.xml b/enunciate.xml
index 52d0ac2..b097c2d 100644
--- a/enunciate.xml
+++ b/enunciate.xml
@@ -10,11 +10,17 @@
 			pattern="org.gcube.datatransfer.resolver.services.UriResolverIndex" />
 		<exclude
 			pattern="org.gcube.datatransfer.resolver.services.UriResolverInfo" />
-		<exclude pattern="org.gcube.datatransfer.resolver.services.OatResolver" />
+		<exclude
+			pattern="org.gcube.datatransfer.resolver.services.OatResolver" />
 		<exclude
 			pattern="org.gcube.datatransfer.resolver.services.tobackward.BackCatalogueResolver" />
 		<exclude
 			pattern="org.gcube.datatransfer.resolver.services.tobackward.BackUriResolverCatalogueResolver" />
+
+		<exclude pattern="org.geotoolkit.internal.jaxb.referencing.*" />
+
+		<exclude pattern="org.opengis.metadata.*" />
+
 	</api-classes>
 
 	<modules>
diff --git a/pom.xml b/pom.xml
index 3df99b0..3bd3cef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,15 +249,7 @@
 			<version>4.8.2</version>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- Required for Enunciate plugin -->
-		<dependency>
-			<groupId>org.geotoolkit</groupId>
-			<artifactId>geotk-xml-base</artifactId>
-			<version>3.20-geoapi-3.0</version>
-			<scope>provided</scope>
-		</dependency>
-
+		
 	</dependencies>
 
 	<build>