From 6044b603f010e32022a29917be3e1086c19e4f55 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@panichipc>
Date: Wed, 10 Jun 2020 16:13:38 +0200
Subject: [PATCH] ref 19423: DataMiner - Update DataMiner Service in Dev for
 support https

https://support.d4science.org/issues/19423

Updated for support https protocol
---
 CHANGELOG.md  | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 changelog.xml | 22 ++++++++++----------
 pom.xml       |  2 +-
 3 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..518bffe
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,57 @@
+
+# Changelog
+
+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).
+
+
+## [v1.5.1] [r4.24.0] - [2020-06-10]
+
+### Features
+
+- Updated for support https protocol [#19423]
+
+## [v1.5.0] - [2017-02-15]
+
+### Features
+
+- Removed ScopeProvider calls
+
+## [v1.4.0] - [2016-12-01]
+
+### Features
+
+- Updated algorithms to DataMiner
+
+## [v1.3.0] - [2014-12-05]
+
+### Features
+
+- algorithm SubmitQuery modified in order to pass the string pathfile to the submitQuery method of class DatabaseManagement in order to generate a file and retrieve it from the statistical manager with the map as output.
+- Algorithms RandomSampleOnTable, SampleOnTable, SmartSampleOnTable and SubmitQuery modified in order to manage the file as output.
+- total number rows returned as output for the result of the submit Query operation: algorithm SubmitQuery modified
+
+## [v1.2.0] - [2014-10-27]
+
+### Features
+
+- some algorithms modified to cope modifications applied in the database-resource-manager component and regarding the management of the same access point for a resource and the database connection shutdown.
+
+## [v1.1.0] - [2014-09-10]
+
+### Features
+
+- SubmitQuery algorithm updated because input parameters in the SubmitQuery method of DatabaseManagement class have been updated
+- timer added in the SubmitQuery algorithm that stops the query execution after 30 minutes
+- hibernate bug fixed and related to a join tables with same columns names. Bug resolved using JDBC. GetConnection method changed in the SubmitQuery algorithm to create the connection with JDBC
+- method shutdown of algorithm SubmitQuery implemented in order to allow a user to cancel a submit query operation
+- bug fixed when two algorithms are submitted concurrently.Bug related to map result's name. Bug fixed generating the name as ResultsMap"+UUID.randomUUID()
+- classes SubmitQuery, SampleOnTable, SmartSampleOnTable, RandomSampleOnTable modified in order to not make available the file as result
+- file DestinationDBHibernate modified to insert the property on the timeout
+- bug fixed on table names that are keywords.Method GetTableDetails corrected to consider the name as schema.table for postgres and database.table for mysql
+
+## [v1-0-0] - [2014-06-09]
+
+### Features
+
+- first release
\ No newline at end of file
diff --git a/changelog.xml b/changelog.xml
index dd7d1cf..7a89685 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,21 +1,21 @@
 <ReleaseNotes>
 	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-5-1"
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-5-1"
+		date="2020-06-10">
+			<Change>Updated for support https protocol [#19423]</Change>
+	</Changeset>
+	<Changeset
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-5-0"
 		date="2017-02-15">
 		<Change>Removed ScopeProvider calls</Change>
 	</Changeset>
 	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-5-0"
-		date="2017-02-15">
-		<Change>Removed ScopeProvider calls</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-4-0"
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-4-0"
 		date="2016-12-01">
 		<Change>Updated algorithms to DataMiner</Change>
 	</Changeset>
 	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-3-0"
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-3-0"
 		date="2014-12-05">
 		<Change>algorithm SubmitQuery modified in order to pass the string
 			pathfile to the submitQuery method of class DatabaseManagement in
@@ -31,7 +31,7 @@
 		</Change>
 	</Changeset>
 	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-2-0"
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-2-0"
 		date="2014-10-27">
 		<Change>some algorithms modified to cope modifications applied in the
 			database-resource-manager component and regarding the management of
@@ -41,7 +41,7 @@
 		</Change>
 	</Changeset>
 	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-1-0"
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-1-0"
 		date="2014-09-10">
 		<Change>SubmitQuery algorithm updated because input parameters
 			in the
@@ -77,7 +77,7 @@
 		</Change>
 	</Changeset>
 	<Changeset
-		component="org.gcube.dataaccess.algorithms.database-rm-algorithms.1-0-0"
+		component="org.gcube.dataaccess.algorithms.database-resource-manager.1-0-0"
 		date="2014-06-09">
 		<Change>first release</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index 6da1a93..4265fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.dataaccess</groupId>
 	<artifactId>database-resource-manager-algorithm</artifactId>
-	<version>1.5.1-SNAPSHOT</version>
+	<version>1.5.1</version>
 	<name>database-resource-manager-algorithm</name>
 	<description>Database Resource Manager Algorithm</description>