From d2bc0039d2a99705611b7b97247de55c6b5f6e87 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 5 Apr 2022 18:34:16 +0200
Subject: [PATCH 1/3] Added the support to new JWT token via URI Resolver

---
 .settings/org.eclipse.wst.common.component | 2 +-
 CHANGELOG.md                               | 5 +++++
 changelog.xml                              | 4 ++++
 pom.xml                                    | 4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5181e5d..0ede833 100755
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -59,7 +59,7 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="dataminer-1.8.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dataminer/dataminer">
+        <dependent-module archiveName="dataminer-1.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dataminer/dataminer">
             <dependency-type>uses</dependency-type>
         </dependent-module>
                                                                                                 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3f028a..245f1a8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [v1.2.0-SNAPSHOT] - 2022-04-05
+
+-  Added support to  new JWT token via URI Resolver [#23107]
+
+
 ## [v1.1.10] - 2022-03-21
 
 - Update wps service to support not writing of the computation status to the user's workspace [#23054]
diff --git a/changelog.xml b/changelog.xml
index a6a6274..f754904 100755
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.data-analysis.wps.1-2-0"
+		date="2022-04-05">
+		<Change>Added support to  new JWT token via URI Resolver [#23107]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.data-analysis.wps.1-1-10"
 		date="2022-03-26">
 		<Change>Update wps service to support not writing of the computation status to the user's workspace [#23054]</Change>
diff --git a/pom.xml b/pom.xml
index a0e4ab9..600008d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.data-analysis</groupId>
 	<artifactId>wps</artifactId>
-	<version>1.1.10</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>WPS</name>
 	<description>A service implementing a WPS provider in the D4Science e-Infrastructure</description>
 
@@ -87,7 +87,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.1.1</version>
+				<version>2.2.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

From 713de1799aeeef78f03ee70ae356b3cd0dcbb94c Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 6 Apr 2022 16:43:24 +0200
Subject: [PATCH 2/3] Updated for pre

---
 .settings/org.eclipse.wst.common.component | 3 +++
 pom.xml                                    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 0ede833..4c463e8 100755
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -62,6 +62,9 @@
         <dependent-module archiveName="dataminer-1.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dataminer/dataminer">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="ecological-engine-smart-executor-1.6.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ecological-engine-smart-executor/ecological-engine-smart-executor">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
                                                                                                 
         
         
diff --git a/pom.xml b/pom.xml
index 600008d..2b12ca1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.2.0-SNAPSHOT</version>
+				<version>2.1.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

From 5cdcf50f1e30ad2301e7a1ce758ac95131ef8a02 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 7 Apr 2022 15:32:12 +0200
Subject: [PATCH 3/3] Added support to  new JWT token via URI Resolver [#23107]

---
 .settings/org.eclipse.wst.common.component | 4 ++--
 CHANGELOG.md                               | 2 +-
 pom.xml                                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 4c463e8..81989ef 100755
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -59,10 +59,10 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="dataminer-1.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dataminer/dataminer">
+        <dependent-module archiveName="dataminer-1.9.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dataminer/dataminer">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="ecological-engine-smart-executor-1.6.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ecological-engine-smart-executor/ecological-engine-smart-executor">
+        <dependent-module archiveName="ecological-engine-smart-executor-1.6.7.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ecological-engine-smart-executor/ecological-engine-smart-executor">
             <dependency-type>uses</dependency-type>
         </dependent-module>
                                                                                                 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 245f1a8..1193e04 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v1.2.0-SNAPSHOT] - 2022-04-05
+## [v1.2.0] - 2022-04-05
 
 -  Added support to  new JWT token via URI Resolver [#23107]
 
diff --git a/pom.xml b/pom.xml
index 2b12ca1..af51582 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.data-analysis</groupId>
 	<artifactId>wps</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<name>WPS</name>
 	<description>A service implementing a WPS provider in the D4Science e-Infrastructure</description>
 
@@ -109,7 +109,7 @@
 		<dependency>
 			<groupId>org.gcube.dataanalysis</groupId>
 			<artifactId>dataminer</artifactId>
-			<version>[1.8.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<version>[1.8.0, 2.0.0-SNAPSHOT)</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>commons-logging</artifactId>