From 138a6f20867e769a153915a93a4fb761f23aa476 Mon Sep 17 00:00:00 2001
From: Lucio Lelii <lucio.lelii@isti.cnr.it>
Date: Tue, 26 Sep 2017 13:53:15 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/wps@154575
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 distro/changelog.xml                  | 26 +++++---------------------
 src/main/webapp/WEB-INF/README        |  2 +-
 src/main/webapp/WEB-INF/changelog.xml | 26 +++++---------------------
 3 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index cfc9a9c..affddc5 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,26 +1,10 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-03-27">
-		<Change>add user script is executed also when configfile.csv is not present</Change>
+	<Changeset component="org.gcube.data-analysis.wps.1-1-0"
+		date="2017-09-24">
+		<Change>Dynamic adding, removing and updating of algorithms added</Change>
 	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-02-22">
-		<Change>porting to tabualr-data-cl 2.0.0</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
-		<Change>porting to smartgears 2.0</Change>
-	</Changeset>
-     <Changeset component="org.gcube.data-analysis.r-connector.2.0.1" date="2016-05-13">
-		<Change>algorithm for cookie encryption modified to support RStudio server 0.99</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.0.0" date="2016-03-15">
-		<Change>connect method with empty parameters added</Change>
-		<Change>Authorization Framework integration</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.1-0-1"
-		date="2015-5-20">
-		<Change>Bug fixing</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.1-0-0"
-		date="2014-11-02">
+	<Changeset component="org.gcube.data-analysis.wps.1-0-0"
+		date="2017-09-01">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README
index 4c13fdc..77c91ca 100644
--- a/src/main/webapp/WEB-INF/README
+++ b/src/main/webapp/WEB-INF/README
@@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024);
 Version
 --------------------------------------------------
  
-1.1.0-SNAPSHOT (2017-09-25)
+1.1.0-SNAPSHOT (${maven.build.timestamp})
  
 Please see the file named "changelog.xml" in this directory for the release notes.
  
diff --git a/src/main/webapp/WEB-INF/changelog.xml b/src/main/webapp/WEB-INF/changelog.xml
index cfc9a9c..affddc5 100644
--- a/src/main/webapp/WEB-INF/changelog.xml
+++ b/src/main/webapp/WEB-INF/changelog.xml
@@ -1,26 +1,10 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-03-27">
-		<Change>add user script is executed also when configfile.csv is not present</Change>
+	<Changeset component="org.gcube.data-analysis.wps.1-1-0"
+		date="2017-09-24">
+		<Change>Dynamic adding, removing and updating of algorithms added</Change>
 	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-02-22">
-		<Change>porting to tabualr-data-cl 2.0.0</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
-		<Change>porting to smartgears 2.0</Change>
-	</Changeset>
-     <Changeset component="org.gcube.data-analysis.r-connector.2.0.1" date="2016-05-13">
-		<Change>algorithm for cookie encryption modified to support RStudio server 0.99</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.2.0.0" date="2016-03-15">
-		<Change>connect method with empty parameters added</Change>
-		<Change>Authorization Framework integration</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.1-0-1"
-		date="2015-5-20">
-		<Change>Bug fixing</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-analysis.r-connector.1-0-0"
-		date="2014-11-02">
+	<Changeset component="org.gcube.data-analysis.wps.1-0-0"
+		date="2017-09-01">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file