ref 19213: Reinforce the information in the Service Profile tab

https://support.d4science.org/issues/19213 Updated to include new service info
3 years ago · 2977d1f034
parent fff9915e9e
commit 2977d1f034
6 changed files with 82 additions and 21 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,43 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for "data-miner-executor"
+
+
+
+## [v1.3.0-SNAPSHOT] - 2021-10-06
+
+### Features
+
+ - Added cluster description in Service Info [#19213]
+
+
+
+## [v1.2.0] - 2019-10-02
+
+### Features
+
+- Added service info [#12594]
+- Added support to show log information [#11711]
+- Added support to show files html, json, pdf, txt [#17106]
+- Updated information show to the user when a computation is submitted [#17030]
+- Added Item Id support [#16503]
+
+
+
+## [v1.1.0] - 2019-03-13
+
+### Features
+
+- Added automatic run [#16155]
+
+
+
+## [v1.0.0] - 2019-01-31
+
+### Features
+
+- First release
+
+
+
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
--- a/FUNDING.md
+++ b/FUNDING.md
@ -0,0 +1,26 @@
+# Acknowledgments
+
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+    - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
+    - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
+    - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
+    - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
+    - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
+- the H2020 research and innovation programme 
+    - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
+    - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
+    - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
+    - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
+    - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
+    - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
+    - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
+    - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
+    - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
+    - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
+    - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
+    - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
+    - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);
--- a/README.md
+++ b/README.md
@ -34,12 +34,4 @@ open-source software toolkit used for building and operating Hybrid Data
 Infrastructures enabling the dynamic deployment of Virtual Research Environments
 by favouring the realisation of reuse oriented policies.
 
-The projects leading to this software have received funding from a series of European Union programmes including:
-
- the Sixth Framework Programme for Research and Technological Development
-    - DILIGENT (grant no. 004260);
- the Seventh Framework Programme for research, technological development and demonstration 
-    - D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
- the H2020 research and innovation programme 
-    - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001);
-    
+The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)    
--- a/changelog.xml
+++ b/changelog.xml
@ -1,20 +1,19 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.data-miner-executor.1-2-1" date="2019-12-03">
+	<Changeset component="org.gcube.portlets.user.data-miner-executor.1-3-0" date="2021-10-06">
 		<Change>Updated to Git and Jenkins</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.data-miner-executor.1-2-0" date="2019-10-02">
-		<Change>Added service info [ticket #12594]</Change>
-		<Change>Added support to show log information [ticket #11711]</Change>
-		<Change>Added support to show files html, json, pdf, txt [ticket
-			#17106]
+		<Change>Added service info [#12594]</Change>
+		<Change>Added support to show log information [#11711]</Change>
+		<Change>Added support to show files html, json, pdf, txt [#17106]
 		</Change>
 		<Change>Updated information show to the user when a computation is
-			submitted [ticket #17030]
+			submitted [#17030]
 		</Change>
-		<Change>Added Item Id support [ticket #16503]</Change>
+		<Change>Added Item Id support [#16503]</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.data-miner-executor.1-1-0" date="2019-03-13">
-		<Change>Added automatic run [ticket #16155]</Change>
+		<Change>Added automatic run [#16155]</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.data-miner-executor.1-0-0" date="2019-01-31">
 		<Change>First release</Change>
--- a/descriptor.xml
+++ b/descriptor.xml
@ -14,7 +14,8 @@
 			<includes>
 				<include>README.md</include>
 				<include>LICENSE.md</include>
-				<include>changelog.xml</include>
+				<include>FUNDING.md</include>
+				<include>CHANGELOG.md</include>
 				<include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
--- a/pom.xml
+++ b/pom.xml
@ -12,7 +12,7 @@

 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>data-miner-executor</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>war</packaging>

 	<name>data-miner-executor</name>
@ -267,7 +267,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>

 		<dependency>
@ -285,7 +285,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>