From 1fade30403ebe2fcbc59dde94d45a5a09d2b092d Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 5 Sep 2023 15:51:52 +0200
Subject: [PATCH] - Fixed data accounting issue [#25571] - Moved to
 maven-parent 1.2.0 and using parent version range [#25572]

---
 geoportal-service/CHANGELOG.md                               | 5 +++++
 geoportal-service/pom.xml                                    | 4 ++--
 .../gcube/application/geoportal/service/RequestFilter.java   | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md
index 09c6661..b18343e 100644
--- a/geoportal-service/CHANGELOG.md
+++ b/geoportal-service/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog for org.gcube.application.geoportal-service
 
+## [v1.1.1-SNAPSHOT]
+
+- Fixed data accounting issue [#25571]
+- Moved to maven-parent 1.2.0 and using parent version range [#25572]
+
 ## [v1.1.0]
 
 - Prepared the PATCH method [#24985]
diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml
index 981677e..e5a2a66 100644
--- a/geoportal-service/pom.xml
+++ b/geoportal-service/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-service</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<name>Geoportal Service</name>
 	<packaging>war</packaging>
 
 	<parent>
 		<groupId>org.gcube.application.cms</groupId>
 		<artifactId>gcube-cms-suite</artifactId>
-		<version>1.0.4</version>
+		<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
 	</parent>
 
 	<properties>
diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java
index 6ba2dca..ab0602a 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java
@@ -29,7 +29,6 @@ public class RequestFilter implements ContainerRequestFilter, ContainerResponseF
     public void filter(ContainerRequestContext requestContext) throws IOException {
         log.trace("PreMatching RequestFilter");
 
-        SecretManagerProvider.instance.reset();
         SecretManager secretManager = new SecretManager();
 
         String token = AccessTokenProvider.instance.get();
@@ -52,7 +51,7 @@ public class RequestFilter implements ContainerRequestFilter, ContainerResponseF
     public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
             throws IOException {
         log.trace("ResponseFilter");
-        SecretManagerProvider.instance.reset();
+        SecretManagerProvider.instance.remove();
     }
 
 }