From afa17744cbb995f7c66621a94eb3bd6b58bd27b3 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 25 May 2021 16:52:10 +0200
Subject: [PATCH] Fixed project structure to comply with new conventions

---
 CHANGELOG.md  | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 changelog.xml | 36 --------------------------------
 pom.xml       |  4 ++--
 3 files changed, 59 insertions(+), 38 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 changelog.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..984b4c9
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,57 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for Smart Executor Client
+
+
+## [v2.0.0-SNAPSHOT]
+
+- New version of the client to comply with new REST APIs provided by Smart Executor 2.0.0 [#12997]
+
+
+## [v1.7.0] - 2019-02-26
+
+- Fixed gCoreEndpoint filter using got ServiceEndpoints [#12984]
+
+
+## [v1.6.0] - 2017-02-15
+
+- Added client for REST interface of Smart Executor [#5109]
+- Created fallback client presenting as REST client but using SOAP API to support old SmartExecutor instances with new code [#5109]
+- Deprecated old SOAP client [#5109]
+
+
+## [v1.5.0] - 2017-25-07
+
+- Exposed unSchedule(executionIdentifier) API
+
+
+## [v1.4.0] - 2017-03-16
+
+- Fixed classes javadoc
+
+
+## [v1.3.0] - 2016-11-07
+
+- SmartExecutor has been passed to Authorization 2.0 [#4944 #2112]
+- Provided to plugins the possibility to define a custom notifier [#5089]
+
+
+## [v1.2.0] - 2016-02-08
+
+- Using Persistence (CouchDB) to save Scheduled Task configuration [#579]
+- Added Unscheduling feature for repetitive task [#521]
+
+
+## [v1.1.0] - 2015-12-09
+
+- Added Recurrent and Scheduled Task support [#111]
+- Saving Task Evolution on Persistence (CouchDB) [#89]
+
+
+## [v1.0.0] - 2015-02-05
+
+- First Release	
+
+
+
+
diff --git a/changelog.xml b/changelog.xml
deleted file mode 100644
index 3470aee..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<ReleaseNotes>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.2.0.0" date="${buildDate}">
-		<Change>New version fo the client to comply with new REST APIs provided by Smart Executor 2.0.0 #12997</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.7.0" date="2019-02-26">
-		<Change>Fixed gCoreEndpoint filter using got ServiceEndpoints #12984</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.6.0" date="2017-02-15">
-		<Change>Added client for REST interface of Smart Executor #5109</Change>
-		<Change>Created fallback client presenting as REST client but using SOAP api to support old SmartExecutor instances with new code #5109</Change>
-		<Change>Deprecated old SOAP client #5109</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.5.0" date="2017-25-07">
-		<Change>Exposed unSchedule(executionIdentifier) API</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.4.0" date="2017-03-16">
-		<Change>Fixed classes javadoc</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.3.0" date="2016-11-07">
-		<Change>SmartExecutor has been passed to Authorization 2.0 (refs #4944 #2112)</Change>
-		<Change>Provided to plugins the possibility to define a custom notifier (refs #5089)</Change>
-	</Changeset>
-    <Changeset component="org.gcube.vre-management.smart-executor-client.1.2.0" date="2016-02-08">
-		<Change>Using Persistence (CouchDB) to save Scheduled Task configuration (refs #579)</Change>
-		<Change>Added Unscheduling feature for repetitive task (refs #521)</Change>
-	</Changeset>
-    <Changeset component="org.gcube.vre-management.smart-executor-client.1.1.0" date="2015-12-09">
-		<Change>Added Recurrent and Scheduled Task support (refs #111)</Change>
-		<Change>Saving Task Evolution on Persistence (CouchDB) (refs #89)</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.0.0" date="2015-02-05">
-		<Change>First Release</Change>	
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 582b306..a77b5ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.vremanagement</groupId>
 	<artifactId>smart-executor-client</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>Smart Executor Client</name>
 	<description>Smart Executor Client is a library designed to interact with Smart Executor exposed REST API</description>
 	
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>1.4.0</version>
+				<version>2.0.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>