Compare commits
No commits in common. "master" and "r5.13.1" have entirely different histories.
|
|
@ -12,9 +12,8 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 8 [1.8.0_222]">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
|
|
|
|||
11
.project
11
.project
|
|
@ -20,15 +20,4 @@
|
|||
<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>
|
||||
|
|
|
|||
22
CHANGELOG.md
22
CHANGELOG.md
|
|
@ -4,31 +4,13 @@
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -21,14 +21,12 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/gcube-portal-bundle/r
|
|||
|
||||
## Authors
|
||||
|
||||
* **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)
|
||||
* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
|
||||
## Maintainers
|
||||
|
||||
* **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)
|
||||
|
||||
* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
|
||||
## License
|
||||
|
||||
This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details.
|
||||
|
|
|
|||
229
pom.xml
229
pom.xml
|
|
@ -1,22 +1,18 @@
|
|||
<?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.2.0</version>
|
||||
<version>1.1.0</version>
|
||||
</parent>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-portal-bundle</artifactId>
|
||||
<version>5.4.0</version>
|
||||
<version>5.1.1</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>
|
||||
|
|
@ -30,28 +26,37 @@
|
|||
<properties>
|
||||
<tomcat.version>7.0.62</tomcat.version>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
<cassandra.driver.oss.version>4.13.0</cassandra.driver.oss.version>
|
||||
<toreplace-artifactsid>authorization-client</toreplace-artifactsid>
|
||||
<!-- 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,
|
||||
<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-legacy-jdk8,document-store-lib,
|
||||
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-library-stubs,social-service-client,social-service-model,notifications-common-library,tour-manager</snl-artifactsid>
|
||||
<custom-plugins-artifactsid>
|
||||
gcube-responsive-theme,session-timeout-hook,
|
||||
<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,
|
||||
oidc-enrollment-hook,event-publisher-hook,VREFolder-hook,user-registration-hook</custom-plugins-artifactsid>
|
||||
<staging-plugins-artifactsid>portal-staging</staging-plugins-artifactsid>
|
||||
<staging-plugins-artifactsid>portal-staging,portal-auth-library</staging-plugins-artifactsid>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>maven-portal-bom</artifactId>
|
||||
<version>4.0.0</version>
|
||||
<version>3.6.4</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
|
@ -70,8 +75,7 @@
|
|||
<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>
|
||||
|
|
@ -86,8 +90,7 @@
|
|||
<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>
|
||||
|
|
@ -102,8 +105,7 @@
|
|||
<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>
|
||||
|
|
@ -111,6 +113,23 @@
|
|||
<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>
|
||||
|
|
@ -135,12 +154,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>
|
||||
<excludeArtifactIds>
|
||||
${toreplace-artifactsid}
|
||||
</excludeArtifactIds>
|
||||
<overWriteReleases>false</overWriteReleases>
|
||||
<overWriteSnapshots>false</overWriteSnapshots>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
|
|
@ -156,10 +171,8 @@
|
|||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<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>
|
||||
<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_misc</outputDirectory>
|
||||
<excludeArtifactIds>${asl-artifactsid},${fws-artifactsid},${snl-artifactsid},${ep-artifactsid},${custom-plugins-artifactsid}</excludeArtifactIds>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
<excludeTypes>war, gar, tar.gz</excludeTypes>
|
||||
<stripVersion>false</stripVersion>
|
||||
|
|
@ -183,6 +196,40 @@
|
|||
</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>
|
||||
|
|
@ -258,6 +305,10 @@
|
|||
<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>
|
||||
|
|
@ -287,6 +338,43 @@
|
|||
<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>
|
||||
|
|
@ -317,8 +405,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>authorization-client-legacy-jdk8</artifactId>
|
||||
<version>[2.0.8-SNAPSHOT,3.0.0-SNAPSHOT)</version>
|
||||
<artifactId>authorization-client</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -366,6 +453,11 @@
|
|||
<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>
|
||||
|
|
@ -390,31 +482,54 @@
|
|||
<!-- Social Networking Library -->
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-library-stubs</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.social-networking</groupId>
|
||||
<artifactId>social-service-client</artifactId>
|
||||
<artifactId>social-networking-library</artifactId>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-networking-library</artifactId>
|
||||
<artifactId>junit</artifactId>
|
||||
<groupId>junit</groupId>
|
||||
</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>joda-time</groupId>
|
||||
<artifactId>joda-time</artifactId>
|
||||
<version>1.6.2</version>
|
||||
<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>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
|
|
@ -581,6 +696,16 @@
|
|||
<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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue