diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 589972b..1331b59 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,61 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                            
+                                
     
     
     
     
     
-    <wb-module deploy-name="uri-resolver-2.7.2-SNAPSHOT">
-                                                        
+    
+    <wb-module deploy-name="uri-resolver-2.7.2">
+                                                                
+        
         
         
         
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <property name="context-root" value="uri-resolver"/>
-                                                        
+                                                                
+        
         
         
         
         
         
         <property name="java-output-path" value="/uri-resolver/target/classes"/>
-                                                    
+                                                            
+    
     
     
     
     
     
     </wb-module>
-                        
+                            
+
 
 
 
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 24595a4..caa48c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,12 +251,12 @@
 		</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>
+		<!-- <dependency> -->
+		<!-- <groupId>org.geotoolkit</groupId> -->
+		<!-- <artifactId>geotk-xml-base</artifactId> -->
+		<!-- <version>3.20-geoapi-3.0</version> -->
+		<!-- <scope>provided</scope> -->
+		<!-- </dependency> -->
 
 	</dependencies>