Updated the scope of xml-apis [#23510]

CHANGELOG.md

@@ -2,20 +2,20 @@
 
 
 
-## [v1.2.1] [r4.24.0] - 2020-06-18
+## [v1.2.2-SNAPSHOT] - 2022-06-15
 
-### Features
+- Updated the scope of xml-apis [#23510]
+
+
+
+## [v1.2.1] - 2020-06-18
 
 - Updated to support new detachedres-library [#19440]
-
-### Fixes
-
 - Disabled Zoom for charts [#19161]
 
 
-## [v1.2.0] - 2020-04-08
 
-### Features
+## [v1.2.0] - 2020-04-08
 
 - Updated export csv support with Firefox and Safari [#18034]
 - Added Core Services support [#18291]
@@ -27,16 +27,12 @@
 
 ## [v1.1.0] - 2019-10-01
 
-### Features
-
 - Updated to support accounting data visualization at the infrastructure level [#17847]
 
 
 
 ## [v1.0.0] - 2018-08-01
 
-### Features
-
 - First Release
 
 

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);

LICENSE.md

@@ -1,9 +1,10 @@
-#European Union Public Licence V.1.1
-
-##*EUPL © the European Community 2007*
+# European Union Public Licence V. 1.1
 
 
-This **European Union Public Licence** (the **“EUPL”**) applies to the Work or Software
+EUPL © the European Community 2007
+
+
+This European Union Public Licence (the “EUPL”) applies to the Work or Software
 (as defined below) which is provided under the terms of this Licence. Any use of
 the Work, other than as authorised under this Licence is prohibited (to the
 extent such use is covered by a right of the copyright holder of the Work).
@@ -12,13 +13,13 @@ The Original Work is provided under the terms of this Licence when the Licensor
 (as defined below) has placed the following notice immediately following the
 copyright notice for the Original Work:
 
-**Licensed under the EUPL V.1.1**
+Licensed under the EUPL V.1.1
 
 or has expressed by any other mean his willingness to license under the EUPL.
 
 
 
-##1. Definitions
+## 1. Definitions
 
 In this Licence, the following terms have the following meaning:
 
@@ -59,7 +60,7 @@ In this Licence, the following terms have the following meaning:
 
 
 
-##2. Scope of the rights granted by the Licence
+## 2. Scope of the rights granted by the Licence
 
 The Licensor hereby grants You a world-wide, royalty-free, non-exclusive,
 sub-licensable licence to do the following, for the duration of copyright vested
@@ -85,7 +86,7 @@ rights granted on the Work under this Licence.
 
 
 
-##3. Communication of the Source Code
+## 3. Communication of the Source Code
 
 The Licensor may provide the Work either in its Source Code form, or as
 Executable Code. If the Work is provided as Executable Code, the Licensor
@@ -97,7 +98,7 @@ continues to distribute and/or communicate the Work.
 
 
 
-##4. Limitations on copyright
+## 4. Limitations on copyright
 
 Nothing in this Licence is intended to deprive the Licensee of the benefits from
 any exception or limitation to the exclusive rights of the rights owners in the
@@ -106,7 +107,7 @@ applicable limitations thereto.
 
 
 
-##5. Obligations of the Licensee
+## 5. Obligations of the Licensee
 
 The grant of the rights mentioned above is subject to some restrictions and
 obligations imposed on the Licensee. Those obligations are the following:
@@ -147,7 +148,7 @@ reproducing the content of the copyright notice.
 
 
 
-##6. Chain of Authorship
+## 6. Chain of Authorship
 
 The original Licensor warrants that the copyright in the Original Work granted
 hereunder is owned by him/her or licensed to him/her and that he/she has the
@@ -163,7 +164,7 @@ terms of this Licence.
 
 
 
-##7. Disclaimer of Warranty
+## 7. Disclaimer of Warranty
 
 The Work is a work in progress, which is continuously improved by numerous
 contributors. It is not a finished work and may therefore contain defects or
@@ -180,7 +181,7 @@ for the grant of any rights to the Work.
 
 
 
-##8. Disclaimer of Liability
+## 8. Disclaimer of Liability
 
 Except in the cases of wilful misconduct or damages directly caused to natural
 persons, the Licensor will in no event be liable for any direct or indirect,
@@ -193,7 +194,7 @@ laws as far such laws apply to the Work.
 
 
 
-##9. Additional agreements
+## 9. Additional agreements
 
 While distributing the Original Work or Derivative Works, You may choose to
 conclude an additional agreement to offer, and charge a fee for, acceptance of
@@ -207,7 +208,7 @@ any such warranty or additional liability.
 
 
 
-##10. Acceptance of the Licence
+## 10. Acceptance of the Licence
 
 The provisions of this Licence can be accepted by clicking on an icon “I agree”
 placed under the bottom of a window displaying the text of this Licence or by
@@ -222,7 +223,7 @@ Distribution and/or Communication by You of the Work or copies thereof.
 
 
 
-##11. Information to the public
+## 11. Information to the public
 
 In case of any Distribution and/or Communication of the Work by means of
 electronic communication by You (for example, by offering to download the Work
@@ -233,7 +234,7 @@ accessible, concluded, stored and reproduced by the Licensee.
 
 
 
-##12. Termination of the Licence
+## 12. Termination of the Licence
 
 The Licence and the rights granted hereunder will terminate automatically upon
 any breach by the Licensee of the terms of the Licence.
@@ -244,7 +245,7 @@ remain in full compliance with the Licence.
 
 
 
-##13. Miscellaneous
+## 13. Miscellaneous
 
 Without prejudice of Article 9 above, the Licence represents the complete
 agreement between the Parties as to the Work licensed hereunder.
@@ -265,7 +266,7 @@ their choice.
 
 
 
-##14. Jurisdiction
+## 14. Jurisdiction
 
 Any litigation resulting from the interpretation of this License, arising
 between the European Commission, as a Licensor, and any Licensee, will be
@@ -279,7 +280,7 @@ conducts its primary business.
 
 
 
-##15. Applicable Law
+## 15. Applicable Law
 
 This Licence shall be governed by the law of the European Union country where
 the Licensor resides or has his registered office.
@@ -291,13 +292,12 @@ This licence shall be governed by the Belgian law if:
 - or registered office inside a European Union country.
 
 
----
+
+## Appendix
 
 
-##Appendix
 
-
-**“Compatible Licences”** according to article 5 EUPL are:
+“Compatible Licences” according to article 5 EUPL are:
 
 
 - GNU General Public License (GNU GPL) v. 2

README.md

@@ -35,12 +35,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)

changelog.xml

@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-2"
+		date="2022-06-15">
+		<Change>Updated the scope of xml-apis [#23530]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-1"
 		date="2020-06-18">
 		<Change>Updated to support new detachedres-library [#19440]</Change>

descriptor.xml

@@ -15,8 +15,8 @@
 				<include>README.md</include>
 				<include>LICENSE.md</include>
 				<include>CHANGELOG.md</include>
+				<include>FUNDING.md</include>
 				<include>profile.xml</include>
-				<include>changelog.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>

pom.xml

@@ -7,13 +7,13 @@
 		<groupId>org.gcube.tools</groupId>
 		<version>1.1.0</version>
 		<relativePath />
-	</parent> 
+	</parent>
 
 	<!-- POM file generated with GWT webAppCreator -->
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>accounting-dashboard</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<name>accounting-dashboard</name>
@@ -262,8 +262,8 @@
 			<artifactId>detachedres-library</artifactId>
 			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
-		
+
+
 		<!-- Portal Service -->
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
@@ -409,7 +409,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>