gCubeSystem
/
gcube-portal-bundle
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed the Cassandra client from CP, pass through the social service

This commit is contained in:
Massimiliano Assante 2023-12-04 17:43:07 +01:00
parent f824126fe1
commit 1e5ddaf816
3 changed files with 55 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -12,8 +12,9 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@
All notable changes to this project will be documented in this file. 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). 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 ## [v5.2.0] - 2023-03-31
- Removed some deps not needed anymore - Removed some deps not needed anymore

120
pom.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.gcube.tools</groupId> <groupId>org.gcube.tools</groupId>
@ -8,11 +10,13 @@
</parent> </parent>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-portal-bundle</artifactId> <artifactId>gcube-portal-bundle</artifactId>
<version>5.2.0</version> <version>5.3.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<scm> <scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection> <connection>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection> 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> <url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
</scm> </scm>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@ -26,13 +30,18 @@
<properties> <properties>
<tomcat.version>7.0.62</tomcat.version> <tomcat.version>7.0.62</tomcat.version>
<distroDirectory>distro</distroDirectory> <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 --> with the enabling portlets one -->
<!-- <gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> --> <!--
<!-- <usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> --> <gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
<!--
<usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
<!-- <addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> --> <!-- <addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
<!-- <resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> --> <!--
<resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
<gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout> <gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout>
<usersManagementVersionLayout>400</usersManagementVersionLayout> <usersManagementVersionLayout>400</usersManagementVersionLayout>
@ -40,14 +49,18 @@
<resourceManagementVersionLayout>700</resourceManagementVersionLayout> <resourceManagementVersionLayout>700</resourceManagementVersionLayout>
<asl-artifactsid>aslcore,aslsocial</asl-artifactsid> <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, common-gcore-stubs,common-scope,common-scope-maps,common-uri,discovery-client,ic-client,
registry-publisher,common-authorization,authorization-client,document-store-lib, registry-publisher,common-authorization,authorization-client,document-store-lib,
accounting-lib,threadlocal-vars-cleaner,common-generic-clients, accounting-lib,threadlocal-vars-cleaner,common-generic-clients,
event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal,common-gcube-calls</fws-artifactsid> 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> <snl-artifactsid>
<ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor</ep-artifactsid> social-library-stubs,social-service-client,notifications-common-library,tour-manager</snl-artifactsid>
<custom-plugins-artifactsid>gcube-responsive-theme,session-timeout-hook, <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> oidc-enrollment-hook,event-publisher-hook,VREFolder-hook,user-registration-hook</custom-plugins-artifactsid>
<staging-plugins-artifactsid>portal-staging</staging-plugins-artifactsid> <staging-plugins-artifactsid>portal-staging</staging-plugins-artifactsid>
</properties> </properties>
@ -75,7 +88,8 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <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> <includeArtifactIds>${asl-artifactsid}</includeArtifactIds>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
<excludeTypes>gar, tar.gz</excludeTypes> <excludeTypes>gar, tar.gz</excludeTypes>
@ -90,7 +104,8 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_fws</outputDirectory> <outputDirectory>
${basedir}/Portal-Bundle/gCube/lib/_fws</outputDirectory>
<includeArtifactIds>${fws-artifactsid}</includeArtifactIds> <includeArtifactIds>${fws-artifactsid}</includeArtifactIds>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
<excludeTypes>gar, tar.gz</excludeTypes> <excludeTypes>gar, tar.gz</excludeTypes>
@ -105,7 +120,8 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <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> <includeArtifactIds>${snl-artifactsid}</includeArtifactIds>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
<excludeTypes>gar, tar.gz</excludeTypes> <excludeTypes>gar, tar.gz</excludeTypes>
@ -154,7 +170,8 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory> <outputDirectory>
${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
<includeArtifactIds>${staging-plugins-artifactsid}</includeArtifactIds> <includeArtifactIds>${staging-plugins-artifactsid}</includeArtifactIds>
<overWriteReleases>false</overWriteReleases> <overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots> <overWriteSnapshots>false</overWriteSnapshots>
@ -171,8 +188,10 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory> <outputDirectory>
<excludeArtifactIds>${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}</excludeArtifactIds> ${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
<excludeArtifactIds>
${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}</excludeArtifactIds>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
<excludeTypes>war, gar, tar.gz</excludeTypes> <excludeTypes>war, gar, tar.gz</excludeTypes>
<stripVersion>false</stripVersion> <stripVersion>false</stripVersion>
@ -209,7 +228,8 @@
</execution> </execution>
</executions> </executions>
<configuration> <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> <replacements>
<replacement> <replacement>
<token>@gCubeLoggedin@</token> <token>@gCubeLoggedin@</token>
@ -473,54 +493,22 @@
<!-- Social Networking Library --> <!-- Social Networking Library -->
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId> <artifactId>social-library-stubs</artifactId>
<scope>provided</scope> <version>1.0.0-SNAPSHOT</version>
<exclusions> <scope>compile</scope>
<exclusion> </dependency>
<artifactId>junit</artifactId> <dependency>
<groupId>junit</groupId> <groupId>org.gcube.social-networking</groupId>
</exclusion> <artifactId>social-service-client</artifactId>
</exclusions> <version>[1.3.0-SNAPSHOT, 2.0.0)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>notifications-common-library</artifactId> <artifactId>notifications-common-library</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.astyanax</groupId> <groupId>joda-time</groupId>
<artifactId>astyanax-core</artifactId> <artifactId>joda-time</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>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
@ -687,16 +675,6 @@
<artifactId>mongo-java-driver</artifactId> <artifactId>mongo-java-driver</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </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 --> <!-- logging and mailing -->
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>