This commit is contained in:
Massimiliano Assante 2016-11-10 15:57:34 +00:00
parent 144aae719f
commit f136d18ab2
1 changed files with 39 additions and 31 deletions

70
pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-portal-bundle</artifactId> <artifactId>gcube-portal-bundle</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>gcube-portal-bundle</name> <name>gcube-portal-bundle</name>
@ -26,20 +26,23 @@
<!-- As long as we do not automatize this make sure the version correspond <!-- As long as we do not automatize this make sure the version correspond
with the enabling portlets one --> with the enabling portlets one -->
<!-- <gcubeLoggedinVersionLayout>310SNAPSHOT</gcubeLoggedinVersionLayout> --> <gcubeLoggedinVersionLayout>310SNAPSHOT</gcubeLoggedinVersionLayout>
<!-- <usersManagementVersionLayout>300SNAPSHOT</usersManagementVersionLayout> --> <usersManagementVersionLayout>300SNAPSHOT</usersManagementVersionLayout>
<!-- <rolesManagementVersionLayout>160SNAPSHOT</rolesManagementVersionLayout> --> <rolesManagementVersionLayout>160SNAPSHOT</rolesManagementVersionLayout>
<!-- <addUsersVersionLayout>200SNAPSHOT</addUsersVersionLayout> --> <addUsersVersionLayout>200SNAPSHOT</addUsersVersionLayout>
<!-- <resourceManagementVersionLayout>600SNAPSHOT</resourceManagementVersionLayout> --> <resourceManagementVersionLayout>600SNAPSHOT</resourceManagementVersionLayout>
<gcubeLoggedinVersionLayout>310410</gcubeLoggedinVersionLayout> <!-- <gcubeLoggedinVersionLayout>310410</gcubeLoggedinVersionLayout> -->
<usersManagementVersionLayout>310400</usersManagementVersionLayout> <!-- <usersManagementVersionLayout>310400</usersManagementVersionLayout> -->
<rolesManagementVersionLayout>300400</rolesManagementVersionLayout> <!-- <rolesManagementVersionLayout>300400</rolesManagementVersionLayout> -->
<addUsersVersionLayout>210410</addUsersVersionLayout> <!-- <addUsersVersionLayout>210410</addUsersVersionLayout> -->
<resourceManagementVersionLayout>600410</resourceManagementVersionLayout> <!-- <resourceManagementVersionLayout>600410</resourceManagementVersionLayout> -->
<asl-artifactsid>aslcontent,aslcore,aslsearch,aslsocial,accesslogger</asl-artifactsid> <asl-artifactsid>aslcontent,aslcore,aslsearch,aslsocial,accesslogger</asl-artifactsid>
<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,accounting-lib,document-store-lib-couchdb,threadlocal-vars-cleaner,common-generic-clients</fws-artifactsid> <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,
accounting-lib,document-store-lib-couchdb,threadlocal-vars-cleaner,common-generic-clients</fws-artifactsid>
<hl-artifactsid>home-library,home-library-model,home-library-jcr,jackrabbit-jcr-commons,jackrabbit-jcr-rmi-custom,jcr</hl-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> <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,service-endpoint-editor</ep-artifactsid> <ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management,service-endpoint-editor</ep-artifactsid>
@ -276,24 +279,24 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Custom Portal Plugins --> <!-- Custom Portal Plugins -->
<!-- <dependency> --> <dependency>
<!-- <groupId>org.gcube.portal.liferay</groupId> --> <groupId>org.gcube.portal.liferay</groupId>
<!-- <artifactId>social-dockbar-hook</artifactId> --> <artifactId>social-dockbar-hook</artifactId>
<!-- <version>[6.3.0-SNAPSHOT,)</version> --> <version>[6.3.0-SNAPSHOT,)</version>
<!-- <type>war</type> --> <type>war</type>
<!-- </dependency> --> </dependency>
<!-- <dependency> --> <dependency>
<!-- <groupId>org.gcube.portal.liferay</groupId> --> <groupId>org.gcube.portal.liferay</groupId>
<!-- <artifactId>gcube-responsive-theme</artifactId> --> <artifactId>gcube-responsive-theme</artifactId>
<!-- <version>[6.3.0-SNAPSHOT,)</version> --> <version>[6.3.0-SNAPSHOT,)</version>
<!-- <type>war</type> --> <type>war</type>
<!-- </dependency> --> </dependency>
<!-- <dependency> --> <dependency>
<!-- <groupId>org.gcube.portal.liferay</groupId> --> <groupId>org.gcube.portal.liferay</groupId>
<!-- <artifactId>VREHome-template</artifactId> --> <artifactId>VREHome-template</artifactId>
<!-- <version>[6.3.0-SNAPSHOT,)</version> --> <version>[6.3.0-SNAPSHOT,)</version>
<!-- <type>war</type> --> <type>war</type>
<!-- </dependency> --> </dependency>
<dependency> <dependency>
<groupId>org.gcube.portal.plugins</groupId> <groupId>org.gcube.portal.plugins</groupId>
<artifactId>VREFolder-hook</artifactId> <artifactId>VREFolder-hook</artifactId>
@ -400,7 +403,7 @@
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>threadlocal-vars-cleaner</artifactId> <artifactId>threadlocal-vars-cleaner</artifactId>
<version>[2.0.0-SNAPSHOT,)</version> <version>[2.1.0-SNAPSHOT,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
@ -746,6 +749,11 @@
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>util-java</artifactId>
<scope>provided</scope>
</dependency>
<!-- storage layer --> <!-- storage layer -->
<dependency> <dependency>
<groupId>org.gcube.contentmanagement</groupId> <groupId>org.gcube.contentmanagement</groupId>