diff --git a/.classpath b/.classpath
index 9c865fb..81f8060 100644
--- a/.classpath
+++ b/.classpath
@@ -12,8 +12,9 @@
-
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a46d622..3cc431a 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).
+## [v5.3.0-SNAPSHOT] - 2023-12-04
+
+- Removed the Cassandra Java client from common libs, now the portlets pass through the social service
+
## [v5.2.0] - 2023-03-31
- Removed some deps not needed anymore
diff --git a/pom.xml b/pom.xml
index 02482ca..dfac908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
-
+
4.0.0
org.gcube.tools
@@ -8,11 +10,13 @@
org.gcube.distribution
gcube-portal-bundle
- 5.2.0
+ 5.3.0-SNAPSHOT
pom
- scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
- scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
+
+ scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
+
+ scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
https://code-repo.d4science.org/gCubeSystem/${project.artifactId}
${project.artifactId}
@@ -26,13 +30,18 @@
7.0.62
distro
-
-
-
+
+
-
+
320440
400
@@ -40,14 +49,18 @@
700
aslcore,aslsocial
- common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,
+
+ common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,
common-gcore-stubs,common-scope,common-scope-maps,common-uri,discovery-client,ic-client,
registry-publisher,common-authorization,authorization-client,document-store-lib,
accounting-lib,threadlocal-vars-cleaner,common-generic-clients,
event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal,common-gcube-calls
- social-networking-library,notifications-common-library,tour-manager
- gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor
- gcube-responsive-theme,session-timeout-hook,
+
+ social-library-stubs,social-service-client,notifications-common-library,tour-manager
+
+ gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor
+
+ gcube-responsive-theme,session-timeout-hook,
oidc-enrollment-hook,event-publisher-hook,VREFolder-hook,user-registration-hook
portal-staging
@@ -75,7 +88,8 @@
copy-dependencies
- ${basedir}/Portal-Bundle/gCube/lib/_application-support-layer
+
+ ${basedir}/Portal-Bundle/gCube/lib/_application-support-layer
${asl-artifactsid}
true
gar, tar.gz
@@ -90,7 +104,8 @@
copy-dependencies
- ${basedir}/Portal-Bundle/gCube/lib/_fws
+
+ ${basedir}/Portal-Bundle/gCube/lib/_fws
${fws-artifactsid}
true
gar, tar.gz
@@ -105,7 +120,8 @@
copy-dependencies
- ${basedir}/Portal-Bundle/gCube/lib/_social-networking-library
+
+ ${basedir}/Portal-Bundle/gCube/lib/_social-networking-library
${snl-artifactsid}
true
gar, tar.gz
@@ -154,7 +170,8 @@
copy-dependencies
- ${basedir}/Portal-Bundle/gCube/lib/_misc
+
+ ${basedir}/Portal-Bundle/gCube/lib/_misc
${staging-plugins-artifactsid}
false
false
@@ -171,8 +188,10 @@
copy-dependencies
- ${basedir}/Portal-Bundle/gCube/lib/_misc
- ${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}
+
+ ${basedir}/Portal-Bundle/gCube/lib/_misc
+
+ ${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}
true
war, gar, tar.gz
false
@@ -209,7 +228,8 @@
- ${project.basedir}/Portal-Bundle/tomcat-${tomcat.version}/conf/gcube-portlets.properties
+
+ ${project.basedir}/Portal-Bundle/tomcat-${tomcat.version}/conf/gcube-portlets.properties
@gCubeLoggedin@
@@ -473,54 +493,22 @@
org.gcube.portal
- social-networking-library
- provided
-
-
- junit
- junit
-
-
+ social-library-stubs
+ 1.0.0-SNAPSHOT
+ compile
+
+
+ org.gcube.social-networking
+ social-service-client
+ [1.3.0-SNAPSHOT, 2.0.0)
org.gcube.portal
notifications-common-library
- com.netflix.astyanax
- astyanax-core
- provided
-
-
- org.slf4j
- log4j-over-slf4j
-
-
- com.boundary
- high-scale-lib
-
-
-
-
- com.netflix.astyanax
- astyanax-thrift
- provided
-
-
- org.slf4j
- log4j-over-slf4j
-
-
-
-
- com.netflix.astyanax
- astyanax-cassandra
- provided
-
-
- com.github.stephenc.high-scale-lib
- high-scale-lib
- provided
+ joda-time
+ joda-time
org.gcube.portal
@@ -687,16 +675,6 @@
mongo-java-driver
provided
-
- org.apache.derby
- derby
- provided
-
-
- org.apache.derby
- derbytools
- provided
-
com.sun.mail