|
|
|
@ -1,5 +1,7 @@
|
|
|
|
|
<?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>
|
|
|
|
@ -8,11 +10,13 @@
|
|
|
|
|
</parent>
|
|
|
|
|
<groupId>org.gcube.distribution</groupId>
|
|
|
|
|
<artifactId>gcube-portal-bundle</artifactId>
|
|
|
|
|
<version>5.2.0</version>
|
|
|
|
|
<version>5.3.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,28 +30,18 @@
|
|
|
|
|
<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>
|
|
|
|
|
<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,
|
|
|
|
|
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</staging-plugins-artifactsid>
|
|
|
|
|
</properties>
|
|
|
|
@ -75,7 +69,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 +85,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 +101,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 +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>
|
|
|
|
@ -154,7 +134,8 @@
|
|
|
|
|
<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>
|
|
|
|
|
<overWriteReleases>false</overWriteReleases>
|
|
|
|
|
<overWriteSnapshots>false</overWriteSnapshots>
|
|
|
|
@ -171,8 +152,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>
|
|
|
|
|
${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 +179,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>
|
|
|
|
@ -334,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>
|
|
|
|
@ -473,54 +385,34 @@
|
|
|
|
|
<!-- Social Networking Library -->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.gcube.portal</groupId>
|
|
|
|
|
<artifactId>social-networking-library</artifactId>
|
|
|
|
|
<scope>provided</scope>
|
|
|
|
|
<artifactId>social-library-stubs</artifactId>
|
|
|
|
|
<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
|
|
|
|
|
<scope>compile</scope>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.gcube.social-networking</groupId>
|
|
|
|
|
<artifactId>social-service-client</artifactId>
|
|
|
|
|
<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
|
|
|
|
|
<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>
|
|
|
|
|
<version>[1.2.0-SNAPSHOT, 2.0.0)</version>
|
|
|
|
|
</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>
|
|
|
|
@ -687,16 +579,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>
|
|
|
|
|