v5.4.0

README.md
authorization-client-legacy-jdk8 instead of authorization-client
2024-10-30 15:17:32 +01:00 · 2024-10-28 16:04:34 +01:00 · 2024-10-25 16:29:09 +02:00 · 2024-09-26 16:56:18 +02:00 · 2023-12-18 15:12:57 +01:00 · 2023-12-18 12:36:42 +01:00
6 changed files with 90 additions and 183 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- 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>
--- a/.project
+++ b/.project
@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</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>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,13 +4,31 @@
 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.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
+
+- 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
+
+## [v5.1.2] - 2022-11-04
+
+- Updated social lib dependencies in Common CP
+
 ## [v5.1.1] - 2022-09-06

-  Updated dependencies in Common CP
+- Updated dependencies in Common CP

 ## [v5.1.0] - 2022-06-15

-  Removed deprecated home library dependency
+- Removed deprecated home library dependency

 ## [v5.0.2] - 2021-06-24

--- a/README.md
+++ b/README.md
@ -21,12 +21,14 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/gcube-portal-bundle/r

 ## Authors

-* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
+* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
+* **Alfredo Oliviero** ([ORCID]( https://orcid.org/0009-0007-3191-1025)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/A.Oliviero)

 ## Maintainers

-* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
-
+* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
+* **Alfredo Oliviero** ([ORCID]( https://orcid.org/0009-0007-3191-1025)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/A.Oliviero)
+  
 ## License

 This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details.
--- a/pom.xml
+++ b/pom.xml
@ -1,18 +1,22 @@
 <?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>
 		<artifactId>maven-parent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>gcube-portal-bundle</artifactId>
-	<version>5.1.1</version>
+	<version>5.4.0</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,37 +30,28 @@
 	<properties>
 		<tomcat.version>7.0.62</tomcat.version>
 		<distroDirectory>distro</distroDirectory>
-		<!-- As long as we do not automatize this make sure the version correspond 
-			with the enabling portlets one -->
-
-		<!-- <gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
-		<!-- <usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
-		<!-- <addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
-		<!-- <resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
-
-		<gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout>
-		<usersManagementVersionLayout>400</usersManagementVersionLayout>
-		<addUsersVersionLayout>221430</addUsersVersionLayout>
-		<resourceManagementVersionLayout>700</resourceManagementVersionLayout>
-
+		<cassandra.driver.oss.version>4.13.0</cassandra.driver.oss.version>
+		<toreplace-artifactsid>authorization-client</toreplace-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,
-			registry-publisher,common-authorization,authorization-client,document-store-lib,
+			registry-publisher,common-authorization,authorization-client-legacy-jdk8,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,social-service-model,notifications-common-library,tour-manager</snl-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,portal-auth-library</staging-plugins-artifactsid>
+		<staging-plugins-artifactsid>portal-staging</staging-plugins-artifactsid>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.4</version>
+				<version>4.0.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@ -75,7 +70,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 +86,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 +102,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>
@ -113,23 +111,6 @@
 							<useBaseVersion>true</useBaseVersion>
 						</configuration>
 					</execution>
-					<execution>
-						<id>copy-dependencies_enablingportlets</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/deploy</outputDirectory>
-							<includeArtifactIds>${ep-artifactsid}</includeArtifactIds>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTypes>gar, tar.gz</excludeTypes>
-							<stripVersion>false</stripVersion>
-							<useBaseVersion>true</useBaseVersion>
-						</configuration>
-					</execution>
 					<execution>
 						<id>copy-dependencies_customPlugins</id>
 						<phase>compile</phase>
@ -154,8 +135,12 @@
 							<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>
+							<excludeArtifactIds>
+								${toreplace-artifactsid}
+							</excludeArtifactIds>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
@ -171,8 +156,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>
+								${toreplace-artifactsid},${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid},social-networking-library</excludeArtifactIds>
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<excludeTypes>war, gar, tar.gz</excludeTypes>
 							<stripVersion>false</stripVersion>
@ -196,40 +183,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>replacer</artifactId>
-				<version>1.5.3</version>
-				<executions>
-					<execution>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<file>${project.basedir}/Portal-Bundle/tomcat-${tomcat.version}/conf/gcube-portlets.properties</file>
-					<replacements>
-						<replacement>
-							<token>@gCubeLoggedin@</token>
-							<value>${gcubeLoggedinVersionLayout}</value>
-						</replacement>
-						<replacement>
-							<token>@UsersManagement@</token>
-							<value>${usersManagementVersionLayout}</value>
-						</replacement>
-						<replacement>
-							<token>@addUsers@</token>
-							<value>${addUsersVersionLayout}</value>
-						</replacement>
-						<replacement>
-							<token>@ResourcesManagement@</token>
-							<value>${resourceManagementVersionLayout}</value>
-						</replacement>
-					</replacements>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@ -305,10 +258,6 @@
 			<version>[2.0.0-SNAPSHOT,)</version>
 			<type>jar</type>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.portal.auth</groupId>
-			<artifactId>portal-auth-library</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>oidc-enrollment-hook</artifactId>
@ -338,43 +287,6 @@
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>oidc-library-portal</artifactId>
 		</dependency>
-		<!-- Enabling Portlets & Plugins -->
-		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>gcube-login-portlet</artifactId>
-			<version>[3.1.0-SNAPSHOT,)</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>gcube-loggedin</artifactId>
-			<version>[3.2.0-SNAPSHOT,)</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>UsersManagementPortlet</artifactId>
-			<version>[3.4.0-SNAPSHOT,)</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>register-vre-users</artifactId>
-			<version>[2.2.0-SNAPSHOT,)</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>resource-management-portlet</artifactId>
-			<version>[7.0.0-SNAPSHOT,)</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>service-endpoint-editor</artifactId>
-			<version>[2.0.0-SNAPSHOT,)</version>
-			<type>war</type>
-		</dependency>
 		<!-- Application Support Layer -->
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
@ -405,7 +317,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
-			<artifactId>authorization-client</artifactId>
+			<artifactId>authorization-client-legacy-jdk8</artifactId>
+			<version>[2.0.8-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@ -453,11 +366,6 @@
 			<artifactId>common-scope-maps</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>common-uri</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>discovery-client</artifactId>
@ -482,54 +390,31 @@
 		<!-- Social Networking Library -->
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
-			<artifactId>social-networking-library</artifactId>
-			<scope>provided</scope>
+			<artifactId>social-library-stubs</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.social-networking</groupId>
+			<artifactId>social-service-client</artifactId>
 			<exclusions>
 				<exclusion>
-					<artifactId>junit</artifactId>
-					<groupId>junit</groupId>
+					<groupId>org.gcube.portal</groupId>
+					<artifactId>social-networking-library</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.social-networking</groupId>
+			<artifactId>social-service-model</artifactId>
+		</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>
+			<version>1.6.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
@ -696,16 +581,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>
Author	SHA1	Message	Date
Alfredo Oliviero	9dee21d6ed	v5.4.0	2024-10-30 15:17:32 +01:00
Alfredo Oliviero	ccfa5b787b	README.md	2024-10-28 16:04:34 +01:00
Alfredo Oliviero	1c4e038717	authorization-client-legacy-jdk8 instead of authorization-client	2024-10-25 16:29:09 +02:00
Massimiliano Assante	929a9ff594	updated BOM and pom	2024-09-26 16:56:18 +02:00
Massimiliano Assante	bab8cdebdc	fixed	2023-12-18 15:12:57 +01:00
Massimiliano Assante	96fd7fd795	fix for the pom	2023-12-18 12:36:42 +01:00
Massimiliano Assante	ddd90d1e15	changed pom to 3.7.0	2023-12-18 11:13:53 +01:00
Massimiliano Assante	1b7a17a178	ready to release	2023-12-14 14:54:53 +01:00
Massimiliano Assante	7242731662	fixed pom	2023-12-11 15:42:07 +01:00
Massimiliano Assante	9459769684	updated pom	2023-12-11 12:38:46 +01:00
Massimiliano Assante	424d2e02ff	SNAPSHOT	2023-12-07 12:11:54 +01:00
Massimiliano Assante	95be84597a	fixed pom	2023-12-07 12:11:21 +01:00
Massimiliano Assante	82308f93f2	fixed pom	2023-12-07 11:58:01 +01:00
Massimiliano Assante	635280ba79	ready to release	2023-12-04 18:24:44 +01:00
Massimiliano Assante	1e5ddaf816	Removed the Cassandra client from CP, pass through the social service	2023-12-04 17:43:07 +01:00
Massimiliano Assante	f824126fe1	removed obsolete portal-auth library	2023-03-31 12:49:26 +02:00
Massimiliano Assante	067ccfe8b4	RELEASE Version	2023-03-31 12:05:50 +02:00
Massimiliano Assante	549286c0f5	SNAPSHOT Version	2023-03-31 12:05:31 +02:00
Massimiliano Assante	3e52e050b0	- Updated social lib dependencies in Common CP	2022-11-04 12:40:44 +01:00
Massimiliano Assante	44c4c8adc4	Updated social lib dependencies in Common CP	2022-11-04 12:38:20 +01:00