From 2ba86a9f6fd0a913950ae1d0f93b9d92f245d96a Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 11 May 2023 15:49:06 +0200
Subject: [PATCH] merged with branch task_24166

---
 CHANGELOG.md |  7 ++++++-
 pom.xml      | 13 ++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16f7234..edb6acc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,12 @@
 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.0.3] - 2023-03-07
+## [v2.1.0-SNAPSHOT] - 2023-04-12
+
+- Integrated the deleteFileset method [#24977]
+- Integrated with the Geoportal_Resolver service [#25031]
+
+## [v2.0.3] - 2023-02-09
 
 #### Enhancements
 
diff --git a/pom.xml b/pom.xml
index 7f06961..a9d7475 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-data-common</artifactId>
-	<version>2.0.3</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<description>GeoPortal Data Common is common library used by  GUI components developed for GeoNA</description>
 
 	<scm>
@@ -41,7 +41,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.1.0</version>
+				<version>2.2.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -80,7 +80,7 @@
 
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>gcube-url-shortener</artifactId>
+			<artifactId>uri-resolver-manager</artifactId>
 			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
@@ -120,6 +120,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>9.4.1212</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>