diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa2606..2a3fb7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/cms-plugin-framework/CHANGELOG.md b/cms-plugin-framework/CHANGELOG.md index 5a1a0ca..171c4f5 100644 --- a/cms-plugin-framework/CHANGELOG.md +++ b/cms-plugin-framework/CHANGELOG.md @@ -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 diff --git a/cms-plugin-framework/pom.xml b/cms-plugin-framework/pom.xml index f37172e..b726d72 100644 --- a/cms-plugin-framework/pom.xml +++ b/cms-plugin-framework/pom.xml @@ -1,124 +1,124 @@ - 4.0.0 - cms-plugin-framework - 1.0.3 + 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"> + 4.0.0 + cms-plugin-framework + 1.0.4-SNAPSHOT - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - + + org.gcube.application.cms + gcube-cms-suite + [1.0.0, 2.0.0-SNAPSHOT) + - - https://code-repo.d4science.org/gCubeSystem - 1.0 - + + https://code-repo.d4science.org/gCubeSystem + 1.0 + - - scm:git:${gitBaseUrl}/gcube-cms-suite - scm:git:${gitBaseUrl}/gcube-cms-suite - ${gitBaseUrl}/gcube-cms-suite - + + scm:git:${gitBaseUrl}/gcube-cms-suite + scm:git:${gitBaseUrl}/gcube-cms-suite + ${gitBaseUrl}/gcube-cms-suite + - - - - org.gcube.distribution - gcube-smartgears-bom - ${gcube-smartgears-bom-version} - pom - import - + + + + org.gcube.distribution + gcube-smartgears-bom + ${gcube-smartgears-bom-version} + pom + import + - - + + - - - net.postgis - postgis-jdbc - 2.5.0 - + + + net.postgis + postgis-jdbc + 2.5.0 + - - - org.gcube.spatial.data - gis-interface - [2.4.6,3.0.0-SNAPSHOT) - + + + org.gcube.spatial.data + gis-interface + [2.4.6,3.0.0-SNAPSHOT) + - - - org.gcube.data.transfer - data-transfer-library - [1.2.1,2.0.0-SNAPSHOT) - + + + org.gcube.data.transfer + data-transfer-library + [1.2.1,2.0.0-SNAPSHOT) + - - + + - + - - org.gcube.common - authorization-utils - [2.0.0, 3.0.0-SNAPSHOT) - + + org.gcube.common + authorization-utils + [2.0.0, 3.0.0-SNAPSHOT) + - - org.gcube.application.cms - geoportal-common - + + org.gcube.application.cms + geoportal-common + - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + - - - org.gcube.common - storagehub-client-library - + + + org.gcube.common + storagehub-client-library + - - - de.grundid.opendatalab - geojson-jackson - 1.14 - + + + de.grundid.opendatalab + geojson-jackson + 1.14 + - - - org.slf4j - slf4j-api - + + + org.slf4j + slf4j-api + - - org.projectlombok - lombok - + + org.projectlombok + lombok + - - org.reflections - reflections - + + org.reflections + reflections + - - javax.xml.bind - jaxb-api - - + + javax.xml.bind + jaxb-api + + - + \ No newline at end of file diff --git a/concessioni-lifecycle/CHANGELOG.md b/concessioni-lifecycle/CHANGELOG.md index aee662b..5e8173b 100644 --- a/concessioni-lifecycle/CHANGELOG.md +++ b/concessioni-lifecycle/CHANGELOG.md @@ -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 diff --git a/concessioni-lifecycle/pom.xml b/concessioni-lifecycle/pom.xml index 1397911..39c558a 100644 --- a/concessioni-lifecycle/pom.xml +++ b/concessioni-lifecycle/pom.xml @@ -4,15 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 concessioni-lifecycle - 1.1.0 + 1.1.1-SNAPSHOT GNA Concessioni Lifecycle - - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - + + org.gcube.application.cms + gcube-cms-suite + [1.0.0, 2.0.0-SNAPSHOT) + https://code-repo.d4science.org/gCubeSystem diff --git a/concessioni-model/CHANGELOG.md b/concessioni-model/CHANGELOG.md index c8d4329..44e09d7 100644 --- a/concessioni-model/CHANGELOG.md +++ b/concessioni-model/CHANGELOG.md @@ -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 diff --git a/concessioni-model/pom.xml b/concessioni-model/pom.xml index b8a803e..ad2e4fc 100644 --- a/concessioni-model/pom.xml +++ b/concessioni-model/pom.xml @@ -6,15 +6,15 @@ org.gcube.application.cms concessioni-model - 1.0.3 + 1.0.4-SNAPSHOT GNA Concessioni Model - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - + + org.gcube.application.cms + gcube-cms-suite + [1.0.0, 2.0.0-SNAPSHOT) + https://code-repo.d4science.org/gCubeSystem diff --git a/default-lc-managers/CHANGELOG.md b/default-lc-managers/CHANGELOG.md index 89b247f..27d4e38 100644 --- a/default-lc-managers/CHANGELOG.md +++ b/default-lc-managers/CHANGELOG.md @@ -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 diff --git a/default-lc-managers/pom.xml b/default-lc-managers/pom.xml index 244e6b2..6c42649 100644 --- a/default-lc-managers/pom.xml +++ b/default-lc-managers/pom.xml @@ -5,15 +5,14 @@ 4.0.0 default-lc-managers - 1.2.1 + 1.2.2-SNAPSHOT gCube CMS - Default LC Managers - - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - + + org.gcube.application.cms + gcube-cms-suite + [1.0.0, 2.0.0-SNAPSHOT) + https://code-repo.d4science.org/gCubeSystem diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md index 9aae7a7..07750c8 100644 --- a/geoportal-client/CHANGELOG.md +++ b/geoportal-client/CHANGELOG.md @@ -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 diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index 7079db3..435025c 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -4,17 +4,15 @@ 4.0.0 org.gcube.application geoportal-client - 1.2.0 + 1.2.1-SNAPSHOT Geoportal Client - org.gcube.application.cms gcube-cms-suite - 1.0.4 + [1.0.0, 2.0.0-SNAPSHOT) - https://code-repo.d4science.org/gCubeSystem diff --git a/geoportal-common/CHANGELOG.md b/geoportal-common/CHANGELOG.md index 1b5e3df..3d02cae 100644 --- a/geoportal-common/CHANGELOG.md +++ b/geoportal-common/CHANGELOG.md @@ -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] diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml index 57f7153..81d1828 100644 --- a/geoportal-common/pom.xml +++ b/geoportal-common/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 geoportal-common - 1.0.12 + 1.0.13-SNAPSHOT Geoportal Common - org.gcube.application.cms gcube-cms-suite - 1.0.4 + [1.0.0, 2.0.0-SNAPSHOT) + https://code-repo.d4science.org/gCubeSystem 1.0 diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index 09c6661..cd85486 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/CHANGELOG.md @@ -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] diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 981677e..66736ce 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -4,14 +4,14 @@ 4.0.0 org.gcube.application geoportal-service - 1.1.0 + 1.1.1-SNAPSHOT Geoportal Service war org.gcube.application.cms gcube-cms-suite - 1.0.4 + [1.0.0, 2.0.0-SNAPSHOT) @@ -146,35 +146,14 @@ test - + @@ -201,6 +180,15 @@ + + + + src/main/resources + + **/* + + + diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java index 6ba2dca..ab0602a 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java @@ -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(); } } diff --git a/notifications-plugins/CHANGELOG.md b/notifications-plugins/CHANGELOG.md index d1a60b5..d96fade 100644 --- a/notifications-plugins/CHANGELOG.md +++ b/notifications-plugins/CHANGELOG.md @@ -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 diff --git a/notifications-plugins/pom.xml b/notifications-plugins/pom.xml index 6923562..5a2aa0a 100644 --- a/notifications-plugins/pom.xml +++ b/notifications-plugins/pom.xml @@ -5,16 +5,15 @@ 4.0.0 notifications-plugins - 1.0.3 + 1.0.4-SNAPSHOT gCube CMS - Notifications Plugins - - - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - - + + + org.gcube.application.cms + gcube-cms-suite + [1.0.0, 2.0.0-SNAPSHOT) + + https://code-repo.d4science.org/gCubeSystem diff --git a/pom.xml b/pom.xml index 081da7e..ab5406e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ maven-parent org.gcube.tools - 1.1.0 + 1.2.0 org.gcube.application.cms gcube-cms-suite pom - 1.0.4 + 1.0.5-SNAPSHOT Gcube CMS Suite gCube CMS Suite is a set of components designed to manage complex space-temporal Documents defined by metadata Profiles. @@ -22,22 +22,54 @@ distro https://code-repo.d4science.org/gCubeSystem - + 2.3.0 2.4.0 3.7.0 [1.0.0,2.0.0-SNAPSHOT) - - - - + + + + - - 1.0.3 + 1.0.4-SNAPSHOT + + + + geoportal-release-profile + + + Release + + + + 2.3.0 + 2.4.0 + 3.7.0 + [1.0.0,2.0.0-SNAPSHOT) + + + + + geoportal-snapshot-profile + + + !Release + + + + 2.4.0-SNAPSHOT + 2.2.0-SNAPSHOT + 3.7.0-SNAPSHOT + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + + + + @@ -63,9 +95,10 @@ default-lc-managers sdi-plugins notifications-plugins - dataminer-plugins - images-plugin - ckan-plugin + + + + @@ -75,8 +108,8 @@ - cms-test-commons - use-cases + + @@ -340,6 +373,4 @@ - - \ No newline at end of file diff --git a/sdi-plugins/CHANGELOG.md b/sdi-plugins/CHANGELOG.md index 80ec5e7..f617452 100644 --- a/sdi-plugins/CHANGELOG.md +++ b/sdi-plugins/CHANGELOG.md @@ -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] diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index 54d1f7a..b74c727 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -5,16 +5,15 @@ 4.0.0 sdi-plugins - 1.1.1 + 1.1.2-SNAPSHOT gCube CMS - SDI Plugins - org.gcube.application.cms gcube-cms-suite - 1.0.4 + [1.0.0, 2.0.0-SNAPSHOT) - + https://code-repo.d4science.org/gCubeSystem