gCubeSystem
/
gcube-cms-suite
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'task_25570' (#17) from task_25570 into master 

Reviewed-on: #17
This commit is contained in:
Francesco Mangiacrapa 2023-09-08 09:59:39 +02:00
parent 8d7330d16b 8616634652
commit ce8de7845f
21 changed files with 228 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.spatial.data.gcube-sdi-suite
## [v1.0.5-SNAPSHOT]
- Added maven profiles `geoportal-release-profile` and `geoportal-snapshot-profile` [#25570]
- Moved to maven-parent.v1.2.0 [#25570]
## [v1.0.4] - 2023-01-10
- Updated plugin framework

3
cms-plugin-framework/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.cms-plugin-framework
## [v1.0.4-SNAPSHOT] - 2023-09-06
- Using parent range version [#25572]
## [v1.0.3] - 2023-01-10
- UserUtils in framework

188
cms-plugin-framework/pom.xml
View File

@ -1,124 +1,124 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-plugin-framework</artifactId>
<version>1.0.3</version>
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>
<artifactId>cms-plugin-framework</artifactId>
<version>1.0.4-SNAPSHOT</version>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
</parent>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<sis.version>1.0</sis.version>
</properties>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<sis.version>1.0</sis.version>
</properties>
<scm>
<connection>scm:git:${gitBaseUrl}/gcube-cms-suite</connection>
<developerConnection>scm:git:${gitBaseUrl}/gcube-cms-suite</developerConnection>
<url>${gitBaseUrl}/gcube-cms-suite</url>
</scm>
<scm>
<connection>scm:git:${gitBaseUrl}/gcube-cms-suite</connection>
<developerConnection>scm:git:${gitBaseUrl}/gcube-cms-suite</developerConnection>
<url>${gitBaseUrl}/gcube-cms-suite</url>
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId>
<version>${gcube-smartgears-bom-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId>
<version>${gcube-smartgears-bom-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TO REMOVE WHEN LEGACY SUPPORT IS REMOVED -->
<!-- DEPRECATED LEGACY LOGIC SUPPORT -->
<!-- TO REMOVE WHEN LEGACY SUPPORT IS REMOVED -->
<!-- DEPRECATED LEGACY LOGIC SUPPORT -->
<!-- POSTGRES DRIVERS -->
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2.5.0</version>
</dependency>
<!-- POSTGRES DRIVERS -->
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2.5.0</version>
</dependency>
<!-- SDI -->
<dependency>
<groupId>org.gcube.spatial.data</groupId>
<artifactId>gis-interface</artifactId>
<version>[2.4.6,3.0.0-SNAPSHOT)</version>
</dependency>
<!-- SDI -->
<dependency>
<groupId>org.gcube.spatial.data</groupId>
<artifactId>gis-interface</artifactId>
<version>[2.4.6,3.0.0-SNAPSHOT)</version>
</dependency>
<!-- DT -->
<dependency>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-library</artifactId>
<version>[1.2.1,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- DT -->
<dependency>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-library</artifactId>
<version>[1.2.1,2.0.0-SNAPSHOT)</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependencies>
</dependencyManagement>
<dependencies>
<dependencies>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-utils</artifactId>
<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-utils</artifactId>
<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>geoportal-common</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>geoportal-common</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Storage HUB -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
</dependency>
<!-- Storage HUB -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/de.grundid.opendatalab/geojson-jackson -->
<dependency>
<groupId>de.grundid.opendatalab</groupId>
<artifactId>geojson-jackson</artifactId>
<version>1.14</version>
</dependency>
<!-- https://mvnrepository.com/artifact/de.grundid.opendatalab/geojson-jackson -->
<dependency>
<groupId>de.grundid.opendatalab</groupId>
<artifactId>geojson-jackson</artifactId>
<version>1.14</version>
</dependency>
<!-- Common - basic -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- Common - basic -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<!-- <version>2.3.0</version>-->
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<!-- <version>2.3.0</version> -->
</dependency>
</dependencies>
</dependencies>
</project>

3
concessioni-lifecycle/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.cms.concessioni-lifecycle
## [v1.1.1-SNAPSHOT] - 2023-09-06
- Using parent version range [#25572]
## [v1.1.0] - 2023-03-13
- [#24754] Fixed hide/show project ids on the latest node of the relation chain

13
concessioni-lifecycle/pom.xml
View File

@ -4,15 +4,14 @@
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>
<artifactId>concessioni-lifecycle</artifactId>
<version>1.1.0</version>
<version>1.1.1-SNAPSHOT</version>
<name>GNA Concessioni Lifecycle</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
</parent>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>

3
concessioni-model/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.cms.concessioni-model
## [v1.0.4-SNAPSHOT] - 2023-09-06
- Using parent version range [#25572]
## [v1.0.3] - 2023-01-10
- Pom updates

12
concessioni-model/pom.xml
View File

@ -6,15 +6,15 @@
<groupId>org.gcube.application.cms</groupId>
<artifactId>concessioni-model</artifactId>
<version>1.0.3</version>
<version>1.0.4-SNAPSHOT</version>
<name>GNA Concessioni Model</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
</parent>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>

3
default-lc-managers/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.cms.ckan-plugin
## [v1.2.2-SNAPSHOT]- 2023-09-06
- Using parent version range [#25572]
## [v1.2.1]
- Improved some logs

13
default-lc-managers/pom.xml
View File

@ -5,15 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>default-lc-managers</artifactId>
<version>1.2.1</version>
<version>1.2.2-SNAPSHOT</version>
<name>gCube CMS - Default LC Managers</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
</parent>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>

3
geoportal-client/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.geoportal-client
## [v1.2.1-SNAPSHOT] - 2023-09-06
- Using parent version range [#25572]
## [v1.2.0] - 2023-05-11
- Added PATCH method [#24985]
- Integrated `ingnore_errors` in the deleteFileSet

6
geoportal-client/pom.xml
View File

@ -4,17 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.application</groupId>
<artifactId>geoportal-client</artifactId>
<version>1.2.0</version>
<version>1.2.1-SNAPSHOT</version>
<name>Geoportal Client</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
</properties>

3
geoportal-common/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.geoportal-common
## [v1.0.13-SNAPSHOT] - 2023-09-06
- Using parent range version [#25572]
## [v1.0.12] - 2023-05-11
- Integrated the PATCH method [#24985]

6
geoportal-common/pom.xml
View File

@ -3,16 +3,16 @@
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>
<artifactId>geoportal-common</artifactId>
<version>1.0.12</version>
<version>1.0.13-SNAPSHOT</version>
<name>Geoportal Common</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<sis.version>1.0</sis.version>

5
geoportal-service/CHANGELOG.md
View File

@ -1,5 +1,10 @@
# Changelog for org.gcube.application.geoportal-service
## [v1.1.1-SNAPSHOT] - 2023-09-06
- Fixed data accounting issue [#25571]
- Moved to maven-parent 1.2.0 and using parent version range [#25572]
## [v1.1.0]
- Prepared the PATCH method [#24985]

50
geoportal-service/pom.xml
View File

@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.application</groupId>
<artifactId>geoportal-service</artifactId>
<version>1.1.0</version>
<version>1.1.1-SNAPSHOT</version>
<name>Geoportal Service</name>
<packaging>war</packaging>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
@ -146,35 +146,14 @@
<scope>test</scope>
</dependency>
<!-- TEST with JDK1.8
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>1.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<scope>test</scope>
</dependency>
-->
<!-- TEST with JDK1.8 <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId>
<scope>test</scope> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId> <scope>test</scope> </dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <scope>test</scope>
</dependency> <dependency> <groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId> <version>1.5.0</version> <scope>test</scope>
</dependency> <dependency> <groupId>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId>
<scope>test</scope> </dependency> -->
<!-- Plugins related tests -->
@ -201,6 +180,15 @@
</dependencies>
<build>
<!-- Added by Francesco -->
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<!-- SPHINX PLUGIN triggered at 'compile' -->
<plugin>

3
geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java
View File

@ -29,7 +29,6 @@ public class RequestFilter implements ContainerRequestFilter, ContainerResponseF
public void filter(ContainerRequestContext requestContext) throws IOException {
log.trace("PreMatching RequestFilter");
SecretManagerProvider.instance.reset();
SecretManager secretManager = new SecretManager();
String token = AccessTokenProvider.instance.get();
@ -52,7 +51,7 @@ public class RequestFilter implements ContainerRequestFilter, ContainerResponseF
public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
log.trace("ResponseFilter");
SecretManagerProvider.instance.reset();
SecretManagerProvider.instance.remove();
}
}

3
notifications-plugins/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.cms.notifications-plugins
## [v1.0.4-SNAPSHOT] - 2023-09-06
- Using parent version range [#25572]
## [v1.0.3] - 2023-03-06
- [#24702] Fixed the default-lc-managers dependency

17
notifications-plugins/pom.xml
View File

@ -5,16 +5,15 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>notifications-plugins</artifactId>
<version>1.0.3</version>
<version>1.0.4-SNAPSHOT</version>
<name>gCube CMS - Notifications Plugins</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
</parent>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
</properties>

63
pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<packaging>pom</packaging>
<version>1.0.4</version>
<version>1.0.5-SNAPSHOT</version>
<name>Gcube CMS Suite</name>
<description>gCube CMS Suite is a set of components designed to manage complex space-temporal Documents defined by metadata Profiles.</description>
@ -22,22 +22,54 @@
<distroDirectory>distro</distroDirectory>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<!-- prod -->
<!-- default is prod -->
<gcube-bom-version>2.3.0</gcube-bom-version>
<gcube-smartgears-bom-version>2.4.0</gcube-smartgears-bom-version>
<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
<storagehub-version-range>[1.0.0,2.0.0-SNAPSHOT)</storagehub-version-range>
<!--dev -->
<!-- <gcube-bom-version>2.1.0-SNAPSHOT</gcube-bom-version> -->
<!-- <gcube-smartgears-bom-version>2.2.0-SNAPSHOT</gcube-smartgears-bom-version> -->
<!-- <gcube-portal-bom-version>3.7.0-SNAPSHOT</gcube-portal-bom-version> -->
<!-- <storagehub-version-range>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</storagehub-version-range> -->
<!-- <gcube-bom-version>2.1.0-SNAPSHOT</gcube-bom-version> -->
<!-- <gcube-smartgears-bom-version>2.2.0-SNAPSHOT</gcube-smartgears-bom-version> -->
<!-- <gcube-portal-bom-version>3.7.0-SNAPSHOT</gcube-portal-bom-version> -->
<!-- <storagehub-version-range>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</storagehub-version-range> -->
<plugin-framework-version>1.0.3</plugin-framework-version>
<plugin-framework-version>1.0.4-SNAPSHOT</plugin-framework-version>
</properties>
<profiles>
<!-- PROD profile -->
<profile>
<id>geoportal-release-profile</id>
<activation>
<property>
<name>Release</name>
</property>
</activation>
<properties>
<gcube-bom-version>2.3.0</gcube-bom-version>
<gcube-smartgears-bom-version>2.4.0</gcube-smartgears-bom-version>
<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
<storagehub-version-range>[1.0.0,2.0.0-SNAPSHOT)</storagehub-version-range>
</properties>
</profile>
<!-- DEV profile -->
<profile>
<id>geoportal-snapshot-profile</id>
<activation>
<property>
<name>!Release</name>
</property>
</activation>
<properties>
<gcube-bom-version>2.4.0-SNAPSHOT</gcube-bom-version>
<gcube-smartgears-bom-version>2.2.0-SNAPSHOT</gcube-smartgears-bom-version>
<gcube-portal-bom-version>3.7.0-SNAPSHOT</gcube-portal-bom-version>
<storagehub-version-range>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</storagehub-version-range>
</properties>
</profile>
</profiles>
<scm>
@ -63,9 +95,10 @@
<module>default-lc-managers</module>
<module>sdi-plugins</module>
<module>notifications-plugins</module>
<module>dataminer-plugins</module>
<module>images-plugin</module>
<module>ckan-plugin</module>
<!-- <module>dataminer-plugins</module> -->
<!-- <module>images-plugin</module> -->
<!-- <module>ckan-plugin</module> -->
<!-- Custom implementations -->
@ -75,8 +108,8 @@
<!-- Utilities & tests -->
<module>cms-test-commons</module>
<module>use-cases</module>
<!-- <module>cms-test-commons</module> -->
<!-- <module>use-cases</module> -->
</modules>
@ -340,6 +373,4 @@
</plugin>
</plugins>
</build>
</project>

3
sdi-plugins/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog for org.gcube.application.cms.sdi-plugins
## [v1.1.2-SNAPSHOT]
- Using parent version range [#25572]
## [v1.1.1]
- Improved some logs
- Fixed: Centroid Object registered in the Project [#25056]

7
sdi-plugins/pom.xml
View File

@ -5,16 +5,15 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>sdi-plugins</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<name>gCube CMS - SDI Plugins</name>
<parent>
<groupId>org.gcube.application.cms</groupId>
<artifactId>gcube-cms-suite</artifactId>
<version>1.0.4</version>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</parent>
<properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
</properties>