From 7b4d27363c2b8fc74214b5fb50ff0b56bcbb6a0c Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 6 Jul 2022 11:25:09 +0200 Subject: [PATCH] Feature #23622 added Catalogue-Manager and Moderator roles --- CHANGELOG.md | 4 + FUNDING.md | 26 +++++++ README.md | 14 +--- distro/LICENSE | 1 - distro/README | 45 ------------ distro/changelog.xml | 73 ------------------- distro/descriptor.xml | 41 ----------- distro/profile.xml | 25 ------- pom.xml | 7 +- .../model/GatewayRolesNames.java | 2 + 10 files changed, 37 insertions(+), 201 deletions(-) create mode 100644 FUNDING.md delete mode 100644 distro/LICENSE delete mode 100644 distro/README delete mode 100644 distro/changelog.xml delete mode 100644 distro/descriptor.xml delete mode 100644 distro/profile.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 966e268..d0d930a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v2.5.4-SNAPSHOT] - 2022-07-06 + + - Feature #23622 added Catalogue-Manager and Moderator roles + ## [v2.5.3] - 2021-04-12 [#20889] UserManagement enhancement: add the roles "Data-Editor" 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/README.md b/README.md index 10101de..3dd1e68 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/usermanagement-core/r ## Authors -* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) +* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante) ## Maintainers -* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) +* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante) ## License @@ -36,12 +36,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/distro/LICENSE b/distro/LICENSE deleted file mode 100644 index 2d9616a..0000000 --- a/distro/LICENSE +++ /dev/null @@ -1 +0,0 @@ -${gcube.license} \ No newline at end of file diff --git a/distro/README b/distro/README deleted file mode 100644 index 70cc12c..0000000 --- a/distro/README +++ /dev/null @@ -1,45 +0,0 @@ -The gCube System ------------------------------------------------------------- - -${gcube.description} - -${gcube.funding} - - -Version --------------------------------------------------- -${version} (${buildDate}) - -Please see the file named "changelog.xml" in this directory for the release notes. - - -Authors -------- - - -Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). - - -Maintainers ------------ - -Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). - - -Documentation -------------- - -Documentation is available on - line from the Projects Documentation wiki: - - {gcube.wikiRoot}/gcube/index.php/UserManagement_Core - - -Support --------------------------------------------------- -Bugs and support requests can be reported in the gCube issue tracking tool: - ${gcube.issueTracking} - - -Licensing --------------------------------------------------- -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. diff --git a/distro/changelog.xml b/distro/changelog.xml deleted file mode 100644 index 2e3fb7a..0000000 --- a/distro/changelog.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - Added getRandomAdmin user method and(improved performance for - method for getting listUsersByGroupAndRole - - Ported to Git - - - Feature #16190, avoid returning Liferay Site Roles in - UserManagement Core Library - - - - Create user method automatic set email as verified - - Added list users methods by range - - Added search users method by groupId and Keywords - - - - Added user number to group model. - - - - Improvements on Liferay's APIs. - - - - Improvements on Liferay's APIs. - - - - Added partial support to Liferay's JSON apis. - - - - Added method to read VirtualGroups associated to sites - - Fix for bug #6115 - - - - Added efficient method to retireve VRE logo URLs - Replaced logging from liferay so that it is possible to - change - level at runtime - - - - First release after upgrading to Liferay 6.2 - - \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml deleted file mode 100644 index 308f7f9..0000000 --- a/distro/descriptor.xml +++ /dev/null @@ -1,41 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - / - true - - README - LICENSE - changelog.xml - - 755 - true - - - target/apidocs - /${artifactId}/doc/api - true - 755 - - - - - ${distroDirectory}/profile.xml - ./ - true - - - target/${build.finalName}.jar - /${artifactId} - - - \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml deleted file mode 100644 index cbf4804..0000000 --- a/distro/profile.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Library - - ASL Social Library - ApplicationSupportLayer - ${artifactId} - 1.0.0 - - - ${artifactId} - ${version} - - ${groupId} - ${artifactId} - ${version} - - - ${build.finalName}.jar - - - - - diff --git a/pom.xml b/pom.xml index f9c5c21..e24e49c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.dvos usermanagement-core - 2.5.3 + 2.5.4-SNAPSHOT jar User Management API @@ -25,8 +25,6 @@ 6.2.5 distro - 1.8 - 1.8 UTF-8 UTF-8 1.1.1 @@ -37,7 +35,7 @@ org.gcube.distribution maven-portal-bom - 3.6.1 + 3.6.4-SNAPSHOT pom import @@ -71,7 +69,6 @@ com.googlecode.json-simple json-simple - ${json.simple.version} diff --git a/src/main/java/org/gcube/vomanagement/usermanagement/model/GatewayRolesNames.java b/src/main/java/org/gcube/vomanagement/usermanagement/model/GatewayRolesNames.java index 1689d84..362320f 100644 --- a/src/main/java/org/gcube/vomanagement/usermanagement/model/GatewayRolesNames.java +++ b/src/main/java/org/gcube/vomanagement/usermanagement/model/GatewayRolesNames.java @@ -4,6 +4,8 @@ public enum GatewayRolesNames { ACCOUNTING_MANAGER("Accounting-Manager"), CATALOGUE_ADMIN("Catalogue-Admin"), CATALOGUE_EDITOR("Catalogue-Editor"), + CATALOGUE_MANAGER("Catalogue-Manager"), + CATALOGUE_MODERATOR("Catalogue-Moderator"), INFRASTRUCTURE_MANAGER("Infrastructure-Manager"), DATAMINER_MANAGER("DataMiner-Manager"), DATA_MANAGER("Data-Manager"),