From b683d043623df4c4886bc0a2954c9229b3ab39b1 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 31 Jan 2022 11:34:35 +0100
Subject: [PATCH] Removed deprecated home library dependency

---
 .DS_Store             | Bin 0 -> 6148 bytes
 CHANGELOG.md          |   4 ++
 distro/descriptor.xml |  30 -----------
 pom.xml               | 121 +++---------------------------------------
 4 files changed, 12 insertions(+), 143 deletions(-)
 create mode 100644 .DS_Store
 delete mode 100644 distro/descriptor.xml

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..30163419fcc7810ae05d17e042efdfec5907fdef
GIT binary patch
literal 6148
zcmeHK!Ab)$5S_Huwv<8-3VI88t=Q5QEMAti-o+I?sMKAy=;FF5?baSjVek4w{)pe>
zOp=PF>cN9ZnSsfhOlA`DvSc;@AlymV1gHT(36(Hc#^wv5ancpZSr4JmbNCR$KDaP}
zWF?v%|B(SYyDFT5f)S+f`TRmW%Rw+54}(|*81)(q<7k{V8gC+(FKlcUQ7Xk7?_N#4
z)K4d4*B@O`?_8-kSlE7W5e=sO+Saj3Qa?%tBb^Y10}Q#ojFM1IT{TI<vCj3(KpCZ9
z+nvoi?ZdikHM;Y<oHZNmZe4cTt@*rM+TJ@jI_p2gkBNFVybAmTwNx!G;028zw)o_Y
zl2|2o7`2#Tk;%vmFaylMnlfOoyHaIM_s82}2AF~0GeGx)L?v`AW(M`ufermW(s+T8
z1Z{dt5K4=V#mpd%pa_$SXi|lJVhEFtere+zi<v=_4nnVt^VpSzeW3`wI{Kv!2jLjx
zmKk6MmKn&KZjI{y$@lO7<s|Mg1I)l$F(3*(ujk^HY;9fH9MxKhdW%Xzahbu76f|@x
g##k!FJE&UFFUdf3EM^ALgTg-ong(u|fj?#79k?4$O8@`>

literal 0
HcmV?d00001

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17339e1..9691bf8 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.1.0-SNAPSHOT] - 2021-06-24
+
+-  Removed deprecated home library dependency
+
 ## [v5.0.2] - 2021-06-24
 
 - Added support for authorization common AccessToken provider and common-gcube-calls in CP
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index a01bf47..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>portal</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/META-INF</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>		
-		<fileSet>
-			<directory>Portal-Bundle</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<fileMode>755</fileMode>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9fdaffb..d5e0930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>gcube-portal-bundle</artifactId>
-	<version>5.0.2</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<scm>
 		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
@@ -47,7 +47,6 @@
 			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>
-		<hl-artifactsid>home-library,home-library-model,home-library-jcr,jackrabbit-jcr-commons,jackrabbit-jcr-rmi-custom,jcr</hl-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,
@@ -59,7 +58,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.3</version>
+				<version>3.7.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -67,6 +66,12 @@
 	</dependencyManagement>
 	<build>
 		<plugins>
+		<plugin>
+				<!-- https://mvnrepository.com/artifact/org.codehaus.gmaven/groovy-maven-plugin -->
+				<groupId>org.codehaus.gmaven</groupId>
+				<artifactId>groovy-maven-plugin</artifactId>
+				<version>2.1.1</version>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -101,21 +106,6 @@
 							<useBaseVersion>true</useBaseVersion>
 						</configuration>
 					</execution>
-					<execution>
-						<id>copy-dependencies-home-library</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_home-library</outputDirectory>
-							<includeArtifactIds>${hl-artifactsid}</includeArtifactIds>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTypes>gar, tar.gz</excludeTypes>
-							<stripVersion>false</stripVersion>
-							<useBaseVersion>true</useBaseVersion>
-						</configuration>
-					</execution>
 					<execution>
 						<id>copy-dependencies-social-networking-library</id>
 						<phase>compile</phase>
@@ -248,25 +238,6 @@
 					</replacements>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<appendAssemblyId>false</appendAssemblyId>
-					<descriptors>
-						<descriptor>distro/descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>portal</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 		<!-- Transitives to be excluded -->
@@ -497,82 +468,6 @@
 			<scope>provided</scope>
 		</dependency>
 		<!-- End FWS -->
-		<!-- Home Library -->
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library</artifactId>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>cxf-rt-rs-client</artifactId>
-					<groupId>org.apache.cxf</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-model</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>gov.nih.imagej</groupId>
-			<artifactId>imagej</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.lowagie</groupId>
-			<artifactId>itext</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jackrabbit</groupId>
-			<artifactId>jackrabbit-jcr-commons</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.externals</groupId>
-			<artifactId>jackrabbit-jcr-rmi-custom</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.jcr</groupId>
-			<artifactId>jcr</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jfile</groupId>
-			<artifactId>jfile</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-core</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xmlpull</groupId>
-			<artifactId>xmlpull</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xpp3</groupId>
-			<artifactId>xpp3_min</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xml-apis</groupId>
-			<artifactId>xml-apis</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<!-- End Home Library -->
 		<!-- Social Networking Library -->
 		<dependency>
 			<groupId>org.gcube.portal</groupId>