From 2562451221f27953b45990c42f4441e221df946c Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 23 Mar 2021 18:57:57 +0100 Subject: [PATCH] Refs #21013: Migrate accounting-manager to postgresql persistence Updated Jenkins Files --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ FUNDING.md | 26 ++++++++++++++++++++++++++ LICENSE.md | 44 ++++++++++++++++++++++---------------------- README.md | 10 +--------- changelog.xml | 5 ++++- descriptor.xml | 3 ++- pom.xml | 2 +- 7 files changed, 93 insertions(+), 34 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 FUNDING.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..cd28803 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,37 @@ +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +# Changelog for "dataminer-manager-theme" + + + +## [v1-3-0-SNAPSHOT] - 2021-03-23 + +### Features + +- Migrate accounting-manager to postgresql persistence [#21013] + + + +## [v1-2-0] - 2017-06-12 + +### Features + +- Support Java 8 compatibility [#8460] + + + +## [v1-1-0] - 2016-01-31 + +### Features + +- Updated icon + + + +## [v1-0-0] - 2015-10-15 + +### Features + +- First Release + + diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000..6fa9eac --- /dev/null +++ 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); \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index 1932b4c..c5e4f4b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,9 +1,10 @@ -#European Union Public Licence V.1.1 +# 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,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 diff --git a/README.md b/README.md index cb3d2d6..d99588b 100644 --- a/README.md +++ b/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); - \ No newline at end of file +The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md) \ No newline at end of file diff --git a/changelog.xml b/changelog.xml index 224082b..6722316 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,6 +1,9 @@ + + Migrate accounting-manager to postgresql persistence [#21013] + - Support Java 8 compatibility [ticket #8460] + Support Java 8 compatibility [#8460] Updated icon diff --git a/descriptor.xml b/descriptor.xml index ae5bfde..3b84644 100644 --- a/descriptor.xml +++ b/descriptor.xml @@ -14,8 +14,9 @@ README.md LICENSE.md + FUNDING.md + CHANGELOG.md profile.xml - changelog.xml 755 true diff --git a/pom.xml b/pom.xml index d7437ac..a130ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.gcube.portlets.admin accounting-manager-theme - 1.2.1-SNAPSHOT + 1.3.0-SNAPSHOT jar