Compare commits

..

1 Commits

Author SHA1 Message Date
Ahmed Salah Tawfik Ibrahim 5c3d4edd39 Removed SNL 2024-01-25 17:12:57 +01:00
5 changed files with 22 additions and 53 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -20,15 +20,4 @@
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1729874048042</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>

View File

@ -4,15 +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.4.0]
- updated pom, maven parent and BOM
- authorization-client-legacy-jdk8 instead of authorization-client (fix patch problem)
## [v5.3.0] - 2023-12-04 ## [v5.3.0] - 2023-12-04
- Removed the Cassandra Java client from common libs, now the portlets pass through the social service - Removed the Cassandra Java client from common libs, now the portlets pass through the social service
- Removed the social networking library from the libs
## [v5.2.0] - 2023-03-31 ## [v5.2.0] - 2023-03-31
@ -22,6 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Updated social lib dependencies in Common CP - Updated social lib dependencies in Common CP
## [v5.1.1] - 2022-09-06 ## [v5.1.1] - 2022-09-06
- Updated dependencies in Common CP - Updated dependencies in Common CP

View File

@ -21,13 +21,11 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/gcube-portal-bundle/r
## Authors ## Authors
* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante) * **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
* **Alfredo Oliviero** ([ORCID]( https://orcid.org/0009-0007-3191-1025)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/A.Oliviero)
## Maintainers ## Maintainers
* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante) * **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
* **Alfredo Oliviero** ([ORCID]( https://orcid.org/0009-0007-3191-1025)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/A.Oliviero)
## License ## License

40
pom.xml
View File

@ -6,11 +6,11 @@
<parent> <parent>
<groupId>org.gcube.tools</groupId> <groupId>org.gcube.tools</groupId>
<artifactId>maven-parent</artifactId> <artifactId>maven-parent</artifactId>
<version>1.2.0</version> <version>1.1.0</version>
</parent> </parent>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-portal-bundle</artifactId> <artifactId>gcube-portal-bundle</artifactId>
<version>5.4.0</version> <version>5.3.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<scm> <scm>
<connection> <connection>
@ -31,16 +31,15 @@
<tomcat.version>7.0.62</tomcat.version> <tomcat.version>7.0.62</tomcat.version>
<distroDirectory>distro</distroDirectory> <distroDirectory>distro</distroDirectory>
<cassandra.driver.oss.version>4.13.0</cassandra.driver.oss.version> <cassandra.driver.oss.version>4.13.0</cassandra.driver.oss.version>
<toreplace-artifactsid>authorization-client</toreplace-artifactsid>
<asl-artifactsid>aslcore,aslsocial</asl-artifactsid> <asl-artifactsid>aslcore,aslsocial</asl-artifactsid>
<fws-artifactsid> <fws-artifactsid>
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, common-gcore-stubs,common-scope,common-scope-maps,common-uri,discovery-client,ic-client,
registry-publisher,common-authorization,authorization-client-legacy-jdk8,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> <sn-artifactsid>
social-library-stubs,social-service-client,social-service-model,notifications-common-library,tour-manager</snl-artifactsid> social-service-client,social-service-model,notifications-common-library,tour-manager</sn-artifactsid>
<custom-plugins-artifactsid> <custom-plugins-artifactsid>
gcube-responsive-theme,session-timeout-hook, 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>
@ -51,7 +50,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId> <artifactId>maven-portal-bom</artifactId>
<version>4.0.0</version> <version>3.7.0</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -96,15 +95,15 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-dependencies-social-networking-library</id> <id>copy-dependencies-social-networking</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory> <outputDirectory>
${basedir}/Portal-Bundle/gCube/lib/_social-networking-library</outputDirectory> ${basedir}/Portal-Bundle/gCube/lib/_social-networking</outputDirectory>
<includeArtifactIds>${snl-artifactsid}</includeArtifactIds> <includeArtifactIds>${sn-artifactsid}</includeArtifactIds>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
<excludeTypes>gar, tar.gz</excludeTypes> <excludeTypes>gar, tar.gz</excludeTypes>
<stripVersion>false</stripVersion> <stripVersion>false</stripVersion>
@ -138,9 +137,6 @@
<outputDirectory> <outputDirectory>
${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory> ${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
<includeArtifactIds>${staging-plugins-artifactsid}</includeArtifactIds> <includeArtifactIds>${staging-plugins-artifactsid}</includeArtifactIds>
<excludeArtifactIds>
${toreplace-artifactsid}
</excludeArtifactIds>
<overWriteReleases>false</overWriteReleases> <overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots> <overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer> <overWriteIfNewer>true</overWriteIfNewer>
@ -159,7 +155,7 @@
<outputDirectory> <outputDirectory>
${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory> ${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
<excludeArtifactIds> <excludeArtifactIds>
${toreplace-artifactsid},${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid},social-networking-library</excludeArtifactIds> ${asl-artifactsid},${fws-artifactsid},${sn-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>
@ -317,8 +313,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>authorization-client-legacy-jdk8</artifactId> <artifactId>authorization-client</artifactId>
<version>[2.0.8-SNAPSHOT,3.0.0-SNAPSHOT)</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -388,24 +383,15 @@
</dependency> </dependency>
<!-- End FWS --> <!-- End FWS -->
<!-- Social Networking Library --> <!-- Social Networking Library -->
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>social-library-stubs</artifactId>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.social-networking</groupId> <groupId>org.gcube.social-networking</groupId>
<artifactId>social-service-client</artifactId> <artifactId>social-service-client</artifactId>
<exclusions> <version>[2.0.0-SNAPSHOT, 3.0.0)</version>
<exclusion>
<groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.social-networking</groupId> <groupId>org.gcube.social-networking</groupId>
<artifactId>social-service-model</artifactId> <artifactId>social-service-model</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>