From 0241437c825cb83a7c400bceda53fd74af6e47c0 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 27 Apr 2022 12:05:36 +0200
Subject: [PATCH 1/3] bug fixing #23213

---
 .settings/org.eclipse.wst.common.component | 29 ++++++++++++++--------
 enunciate.xml                              |  8 +++++-
 pom.xml                                    | 12 ++++-----
 3 files changed, 32 insertions(+), 17 deletions(-)

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>
 

From 1a9aaeaf82aa5b5b9c6f3d751d14e4b8680c2e11 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 27 Apr 2022 12:12:21 +0200
Subject: [PATCH 2/3] moved to 2.7.3-SNAPSHOT

---
 CHANGELOG.md | 14 ++++++++++----
 pom.xml      |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 324d516..82aca7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,13 @@
 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-7.2] - 2022-04-06
+## [v2.7.3-SNAPSHOT] - 2022-04-27
+
+**Bug Fixing**
+
+- [#23213] Fixing NoClassDefFoundError: org/geotoolkit/xml/XML
+
+## [v2.7.2] - 2022-04-06
 
 **New**
 
@@ -18,7 +24,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - [#20743] Integration with javamelody
 
-## [v2-6-1] - 2022-01-17
+## [v2.6.1] - 2022-01-17
 
 **New features**
 
@@ -30,7 +36,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - [#21560] Checking the bug fix done
 - Moved to gcube-smartgears-bom.2.1.0
 
-## [v2-5-0] - 2021-04-08
+## [v2.5.0] - 2021-04-08
 
 **New features**
 
@@ -41,7 +47,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 [#21093] StorageHubResolver HEAD request does not support Content-Length
 
 
-## [v2-4-1] - 2021-01-13
+## [v2.4.1] - 2021-01-13
 
 **Bug Fixes**
 
diff --git a/pom.xml b/pom.xml
index caa48c3..8505994 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.gcube.data.transfer</groupId>
 	<artifactId>uri-resolver</artifactId>
-	<version>2.7.2</version>
+	<version>2.7.3-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<description>The URI Resolver is an HTTP URI resolver implemented as a REST service which gives access trough HTTP to different gcube Resolvers and gCube Applications.</description>
 

From a8b4e709532b06781eb6e5df1bcd47e1323ad511 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 27 Apr 2022 12:56:15 +0200
Subject: [PATCH 3/3] removed geotk-xml-base dependency

---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8505994..e1d18f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,14 +250,6 @@
 			<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>