From 72427316626fb16da91fbda5f6782b22e4202837 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 11 Dec 2023 15:42:07 +0100
Subject: [PATCH] fixed pom

---
 pom.xml | 114 ++------------------------------------------------------
 1 file changed, 3 insertions(+), 111 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7562c4b..b71527d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,23 +31,6 @@
 		<tomcat.version>7.0.62</tomcat.version>
 		<distroDirectory>distro</distroDirectory>
 		<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> -->
-		<!-- <addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
-		<!--
-		<resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
-
-		<gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout>
-		<usersManagementVersionLayout>400</usersManagementVersionLayout>
-		<addUsersVersionLayout>221430</addUsersVersionLayout>
-		<resourceManagementVersionLayout>700</resourceManagementVersionLayout>
-
 		<asl-artifactsid>aslcore,aslsocial</asl-artifactsid>
 		<fws-artifactsid>
 			common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,
@@ -57,8 +40,6 @@
 			event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal,common-gcube-calls</fws-artifactsid>
 		<snl-artifactsid>
 			social-library-stubs,social-service-client,social-service-model,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>
@@ -129,23 +110,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>
@@ -214,42 +178,7 @@
 						</goals>
 					</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>			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -354,43 +283,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>
@@ -494,13 +386,13 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-library-stubs</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
+			<version>1.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.social-networking</groupId>
 			<artifactId>social-service-client</artifactId>
-			<version>[1.0.0-SNAPSHOT, 3.0.0)</version>
+			<version>2.0.0-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.gcube.portal</groupId>