diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 4e4a3ad..cac0df4 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -3,7 +3,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 26b6c63..666b2a2 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,34 @@ + + + + + + + + + + + + uses + + + uses + + + + + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd7487..0335d22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,17 @@ 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.7.1-SNAPSHOT] - 2020-12-11 + + - Fix for issue on test #23646 + ## [v2.7.0] - 2020-12-11 -Feature #19463, gestione Inviti include Keycloak per quanto riguarda la creazione dello user account + - Feature #19463, gestione Inviti include Keycloak per quanto riguarda la creazione dello user account -Ported to git + - Ported to git -Ported to GWT 2.8.2 + - Ported to GWT 2.8.2 ## [v2.6.0] - 2019-04-08 diff --git a/README.md b/README.md index 4557c94..48b853e 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/invite-members/releas ## 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 @@ -39,12 +39,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/pom.xml b/pom.xml index d12a7dc..95a8b1a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user invite-members war - 2.7.0 + 2.7.1-SNAPSHOT Invite Friends to VRE scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git @@ -42,7 +42,7 @@ org.gcube.distribution maven-portal-bom - 3.6.0 + 3.6.4 pom import @@ -70,12 +70,12 @@ org.gcube.portlets.widgets invite-friends-widget - [1.6.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [1.6.2-SNAPSHOT, 2.0.0) org.gcube.portal invites-common-library - [1.5.1-SNAPSHOT, 2.0.0-SNAPSHOT) + [1.5.1-SNAPSHOT, 2.0.0) org.gcube.portal @@ -157,7 +157,7 @@ - NewsFeed.html + InviteMembers.html ${webappDirectory}