diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 91ca62e..8b5c4dc 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
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 6163a8d..0b65e21 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,13 +1,23 @@
-
-
+
+
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
uses
@@ -21,11 +31,19 @@
uses
-
+
+
+
-
+
+
+
-
-
+
+
+
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fe1061..7d37292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
# Changelog
-## [v2.4.0-SNAPSHOT] - 2021-04-30
+## [v2.4.0] - 2021-04-30
-- porting to storagehub messages
+- Feature #21179 porting to storagehub messages
## [v2.3.3] - 2020-10-08
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/changelog.xml b/changelog.xml
deleted file mode 100644
index 6716e19..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
- added support for mentions with @ in user's post as well as application posts
-
-
- bug fix #17269, SocialNetworking service passes wrong email sender in email notifications
-
-
- added get-oauth-profile method for returning Google similar
- JSON Profile
-
-
- Fix for #10997
-
-
- Support for tickets #9333, #9332, #9276
- Added support for caches (ehcache)
-
-
- Fixed bug #8685
-
-
- Moved as service on top of SmartGears
- Exploiting Liferay's Web APIs
-
-
- Custom jackson object mapper is used to have snake case
- fields'names
-
- Improved users version 2 resource with more methods
-
-
- Moved to new Authorization Framework
- Added method to send Messages
- Added new version for the APIs that accept/return JSON
-
- Token is discovered before every call is executed by a filter
-
-
-
- Support for new portal (gCube 4.0.0)
-
-
- Minor bug fixes (look at support ticket #2971)
-
-
- First Release
-
-
diff --git a/descriptor.xml b/descriptor.xml
deleted file mode 100644
index b3f5628..0000000
--- a/descriptor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- servicearchive
-
- tar.gz
-
- /
-
-
- ${distroDirectory}
- /
- true
-
- README
- LICENSE
- changelog.xml
- profile.xml
-
- 755
- true
-
-
-
-
-
- /${artifactId}
-
-
-
\ 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 fc6be41..0000000
--- a/distro/README
+++ /dev/null
@@ -1,62 +0,0 @@
-The gCube System - ${name}
---------------------------------------------------
-
-${description}
-
-
-${gcube.description}
-
-${gcube.funding}
-
-
-Version
---------------------------------------------------
-
-${version} (${buildDate})
-
-Please see the file named "changelog.xml" in this directory for the release notes.
-
-
-Authors
---------------------------------------------------
-
-* Costantino Perciante (costantino.perciante@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
-
-Maintainers
------------
-
-* Costantino Perciante (costantino.perciante@isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
-
-Download information
---------------------------------------------------
-
-Source code is available from SVN:
- ${scm.url}
-
-Binaries can be downloaded from the gCube website:
- ${gcube.website}
-
-
-Installation
---------------------------------------------------
-
-Installation documentation is available on-line in the gCube Wiki:
- ${gcube.wikiRoot}
-
-Documentation
---------------------------------------------------
-
-Documentation is available on-line in the gCube Wiki:
- ${gcube.wikiRoot}
-
-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.
\ No newline at end of file
diff --git a/distro/profile.xml b/distro/profile.xml
deleted file mode 100644
index 4dda0b9..0000000
--- a/distro/profile.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Library
-
- ${description}
- Portal
- ${artifactId}
- 1.0.0
-
-
- ${artifactId}
- ${version}
-
- ${groupId}
- ${artifactId}
- ${version}
-
-
- ${build.finalName}.war
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 405162d..d510da3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portal
social-networking-library-ws
war
- 2.4.0-SNAPSHOT
+ 2.4.0
social-networking-library-ws
Rest interface for the social networking library.
@@ -36,7 +36,7 @@
org.gcube.distribution
gcube-smartgears-bom
- 2.0.0-SNAPSHOT
+ 2.0.0
pom
import
@@ -304,29 +304,10 @@
org.apache.maven.plugins
maven-compiler-plugin
-
- 1.8
+
+ ${java_version}
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- descriptor.xml
-
-
-
-
- servicearchive
- install
-
- single
-
-
-
-
org.apache.maven.plugins
maven-javadoc-plugin