ready to release

.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

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

@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-        
+                
+    
+    
     <wb-module deploy-name="social-networking-library-ws">
-                
+                                
+        
+        
         <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"/>
-                
+                                
+        
+        
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <dependent-module archiveName="portal-manager-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/portal-manager/portal-manager">
             <dependency-type>uses</dependency-type>
@@ -21,11 +31,19 @@
         <dependent-module archiveName="rmp-common-library-2.8.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                
+                                
+        
+        
         <property name="java-output-path" value="/social-networking-library-ws/target/classes"/>
-                
+                                
+        
+        
         <property name="context-root" value="social-networking-library-ws"/>
-            
+                            
-    </wb-module>
     
+    
+    </wb-module>
+            
+
+
 </project-modules>

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
 

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);

changelog.xml

@@ -1,73 +0,0 @@
-<ReleaseNotes>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-3-0"
-		date="2019-10-02">
-		<Change>added support for mentions with @ in user's post as well as application posts</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-2-4"
-		date="2019-07-22">
-		<Change>bug fix #17269, SocialNetworking service passes wrong email sender in email notifications</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-2-3"
-		date="2019-04-05">
-		<Change>added get-oauth-profile method for returning Google similar
-			JSON Profile</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-1-1"
-		date="2018-01-20">
-		<Change>Fix for #10997</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-1-0"
-		date="2017-08-01">
-		<Change>Support for tickets #9333, #9332, #9276</Change>
-		<Change>Added support for caches (ehcache)</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-0-1"
-		date="2017-05-01">
-		<Change>Fixed bug #8685</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.2-0-0"
-		date="2017-02-01">
-		<Change>Moved as service on top of SmartGears</Change>
-		<Change>Exploiting Liferay's Web APIs</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.1-4-0"
-		date="2016-12-01">
-		<Change>Custom jackson object mapper is used to have snake case
-			fields'names
-		</Change>
-		<Change>Improved users version 2 resource with more methods</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.1-3-0"
-		date="2016-10-10">
-		<Change>Moved to new Authorization Framework</Change>
-		<Change>Added method to send Messages</Change>
-		<Change>Added new version for the APIs that accept/return JSON
-		</Change>
-		<Change>Token is discovered before every call is executed by a filter
-		</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.1-2-0"
-		date="2016-06-10">
-		<Change>Support for new portal (gCube 4.0.0)</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.1-1-0"
-		date="2016-04-10">
-		<Change>Minor bug fixes (look at support ticket #2971)</Change>
-	</Changeset>
-	<Changeset
-		component="org.gcube.portal.social-networking-library-ws.1-0-0"
-		date="2015-12-21">
-		<Change>First Release</Change>
-	</Changeset>
-</ReleaseNotes>

descriptor.xml

@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-				<include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target/${build.finalName}.${project.packaging}</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>

distro/LICENSE

@@ -1 +0,0 @@
-${gcube.license}

distro/README

@@ -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.

distro/profile.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID></ID>
-	<Type>Library</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>Portal</Class>
-		<Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.war</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>

pom.xml

@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>social-networking-library-ws</artifactId>
 	<packaging>war</packaging>
-	<version>2.4.0-SNAPSHOT</version>
+	<version>2.4.0</version>
 	<name>social-networking-library-ws</name>
 	<description>Rest interface for the social networking library.</description>
 	<properties>
@@ -36,7 +36,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -304,29 +304,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
+					<source>${java_version}</source>
-					<target>1.8</target>
+					<target>${java_version}</target>
 				</configuration>
 			</plugin>
-			<!-- SA Plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>