Updated the scope of xml-apis [#23510]

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

Disabled Zoom for charts

.classpath

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -50,5 +50,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/accounting-dashboard-1.2.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/accounting-dashboard-1.2.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.settings/org.eclipse.wst.common.component

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="accounting-dashboard-1.2.0">
+    <wb-module deploy-name="accounting-dashboard-1.2.1-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

CHANGELOG.md

@@ -0,0 +1,40 @@
+# Changelog
+
+
+
+## [v1.2.2] - 2022-06-15
+
+- Updated the scope of xml-apis [#23510]
+
+
+
+## [v1.2.1] - 2020-06-18
+
+- Updated to support new detachedres-library [#19440]
+- Disabled Zoom for charts [#19161]
+
+
+
+## [v1.2.0] - 2020-04-08
+
+- Updated export csv support with Firefox and Safari [#18034]
+- Added Core Services support [#18291]
+- Added Detached REs support [#18815]
+- Added the alphabetical sorting of tabs [#18754]
+- Added TOC menu in reports [#18753]
+
+
+
+## [v1.1.0] - 2019-10-01
+
+- Updated to support accounting data visualization at the infrastructure level [#17847]
+
+
+
+## [v1.0.0] - 2018-08-01
+
+- First Release
+
+
+
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

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*
+
+EUPL © the European Community 2007
 
 
-This **European Union Public Licence** (the **“EUPL”**) applies to the Work or Software
+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,7 +13,7 @@ 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.
 
@@ -291,13 +292,12 @@ This licence shall be governed by the Belgian law if:
 - or registered office inside a European Union country.
 
 
----
-
 
 ## 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,16 +1,25 @@
 <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>
+		<Change>Disabled Zoom for charts [#19161]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-0"
 		date="2020-04-08">
-		<Change>Updated export csv support with Firefox and Safari [ticket #18034]</Change>
-		<Change>Added Core Services support [ticket #18291]</Change>
-		<Change>Added Detached REs support [ticket #18815]</Change>
-		<Change>Added the alphabetical sorting of tabs [ticket #18754]</Change>
-		<Change>Added TOC menu in reports [ticket #18753]</Change>
+		<Change>Updated export csv support with Firefox and Safari [#18034]</Change>
+		<Change>Added Core Services support [#18291]</Change>
+		<Change>Added Detached REs support [#18815]</Change>
+		<Change>Added the alphabetical sorting of tabs [#18754]</Change>
+		<Change>Added TOC menu in reports [#18753]</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-1-0"
 		date="2019-10-01">
 		<Change>Updated to support accounting data visualization at the
-			infrastructure level [ticket #17847]</Change>
+			infrastructure level [#17847]</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-0-0"
 		date="2018-08-01">

descriptor.xml

@@ -14,8 +14,9 @@
 			<includes>
 				<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

@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>accounting-dashboard</artifactId>
-	<version>1.2.0</version>
+	<version>1.2.2</version>
 	<packaging>war</packaging>
 
 	<name>accounting-dashboard</name>
@@ -260,7 +260,7 @@
 		<dependency>
 			<groupId>org.gcube.infrastructure.detachedres</groupId>
 			<artifactId>detachedres-library</artifactId>
-			<version>[0.0.1,2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 
@@ -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>

src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java

@@ -372,7 +372,7 @@ public class Chart extends HTMLPanel {
 
 					},
 					zoom : {
-						enabled : true,
+						enabled : false,
 						mode : 'xy',
 						limits : {
 							max : 20,