From 1e5ddaf8160f8433f288c87dfbaa5091e96cfb92 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 4 Dec 2023 17:43:07 +0100
Subject: [PATCH] Removed the Cassandra  client from CP, pass through the
 social service

---
 .classpath   |   3 +-
 CHANGELOG.md |   4 ++
 pom.xml      | 120 +++++++++++++++++++++------------------------------
 3 files changed, 55 insertions(+), 72 deletions(-)

diff --git a/.classpath b/.classpath
index 9c865fb..81f8060 100644
--- a/.classpath
+++ b/.classpath
@@ -12,8 +12,9 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 8 [1.8.0_222]">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.gcube.tools</groupId>
@@ -8,11 +10,13 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>gcube-portal-bundle</artifactId>
-	<version>5.2.0</version>
+	<version>5.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
 		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
 	<name>${project.artifactId}</name>
@@ -26,13 +30,18 @@
 	<properties>
 		<tomcat.version>7.0.62</tomcat.version>
 		<distroDirectory>distro</distroDirectory>
-		<!-- As long as we do not automatize this make sure the version correspond 
+		<cassandra.driver.oss.version>4.13.0</cassandra.driver.oss.version>
+		<!-- As long as we do not automatize this make sure the version
+		correspond 
 			with the enabling portlets one -->
 
-		<!-- <gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
-		<!-- <usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
+		<!--
+		<gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
+		<!--
+		<usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
 		<!-- <addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
-		<!-- <resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
+		<!--
+		<resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
 
 		<gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout>
 		<usersManagementVersionLayout>400</usersManagementVersionLayout>
@@ -40,14 +49,18 @@
 		<resourceManagementVersionLayout>700</resourceManagementVersionLayout>
 
 		<asl-artifactsid>aslcore,aslsocial</asl-artifactsid>
-		<fws-artifactsid>common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,
+		<fws-artifactsid>
+			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</fws-artifactsid>
-		<snl-artifactsid>social-networking-library,notifications-common-library,tour-manager</snl-artifactsid>
-		<ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor</ep-artifactsid>
-		<custom-plugins-artifactsid>gcube-responsive-theme,session-timeout-hook,
+		<snl-artifactsid>
+			social-library-stubs,social-service-client,notifications-common-library,tour-manager</snl-artifactsid>
+		<ep-artifactsid>
+			gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor</ep-artifactsid>
+		<custom-plugins-artifactsid>
+			gcube-responsive-theme,session-timeout-hook,
 			oidc-enrollment-hook,event-publisher-hook,VREFolder-hook,user-registration-hook</custom-plugins-artifactsid>
 		<staging-plugins-artifactsid>portal-staging</staging-plugins-artifactsid>
 	</properties>
@@ -75,7 +88,8 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_application-support-layer</outputDirectory>
+							<outputDirectory>
+								${basedir}/Portal-Bundle/gCube/lib/_application-support-layer</outputDirectory>
 							<includeArtifactIds>${asl-artifactsid}</includeArtifactIds>
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTypes>gar, tar.gz</excludeTypes>
@@ -90,7 +104,8 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_fws</outputDirectory>
+							<outputDirectory>
+								${basedir}/Portal-Bundle/gCube/lib/_fws</outputDirectory>
 							<includeArtifactIds>${fws-artifactsid}</includeArtifactIds>
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTypes>gar, tar.gz</excludeTypes>
@@ -105,7 +120,8 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_social-networking-library</outputDirectory>
+							<outputDirectory>
+								${basedir}/Portal-Bundle/gCube/lib/_social-networking-library</outputDirectory>
 							<includeArtifactIds>${snl-artifactsid}</includeArtifactIds>
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTypes>gar, tar.gz</excludeTypes>
@@ -154,7 +170,8 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
+							<outputDirectory>
+								${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
 							<includeArtifactIds>${staging-plugins-artifactsid}</includeArtifactIds>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
@@ -171,8 +188,10 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
-							<excludeArtifactIds>${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}</excludeArtifactIds>
+							<outputDirectory>
+								${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
+							<excludeArtifactIds>
+								${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}</excludeArtifactIds>
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTypes>war, gar, tar.gz</excludeTypes>
 							<stripVersion>false</stripVersion>
@@ -209,7 +228,8 @@
 					</execution>
 				</executions>
 				<configuration>
-					<file>${project.basedir}/Portal-Bundle/tomcat-${tomcat.version}/conf/gcube-portlets.properties</file>
+					<file>
+						${project.basedir}/Portal-Bundle/tomcat-${tomcat.version}/conf/gcube-portlets.properties</file>
 					<replacements>
 						<replacement>
 							<token>@gCubeLoggedin@</token>
@@ -473,54 +493,22 @@
 		<!-- Social Networking Library -->
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
-			<artifactId>social-networking-library</artifactId>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>junit</artifactId>
-					<groupId>junit</groupId>
-				</exclusion>
-			</exclusions>
+			<artifactId>social-library-stubs</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.social-networking</groupId>
+			<artifactId>social-service-client</artifactId>
+			<version>[1.3.0-SNAPSHOT, 2.0.0)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>notifications-common-library</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.netflix.astyanax</groupId>
-			<artifactId>astyanax-core</artifactId>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.boundary</groupId>
-					<artifactId>high-scale-lib</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.astyanax</groupId>
-			<artifactId>astyanax-thrift</artifactId>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.astyanax</groupId>
-			<artifactId>astyanax-cassandra</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.github.stephenc.high-scale-lib</groupId>
-			<artifactId>high-scale-lib</artifactId>
-			<scope>provided</scope>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
@@ -687,16 +675,6 @@
 			<artifactId>mongo-java-driver</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derbytools</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<!-- logging and mailing -->
 		<dependency>
 			<groupId>com.sun.mail</groupId>