From 22daeac7774b8157269c81f19fdbdc4a35d4e8a0 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 5 Sep 2023 15:13:39 +0200 Subject: [PATCH 01/18] - Added maven profiles `geoportal-release-profile` and `geoportal-snapshot-profile` [#25570] - Moved to maven-parent.v1.2.0 [#25570] --- CHANGELOG.md | 4 ++++ pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 45 insertions(+), 11 deletions(-) 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/pom.xml b/pom.xml index 081da7e..0dada55 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 + + + 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.1.0-SNAPSHOT + 2.2.0-SNAPSHOT + 3.7.0-SNAPSHOT + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + + + + @@ -340,6 +372,4 @@ - - \ No newline at end of file From 1fade30403ebe2fcbc59dde94d45a5a09d2b092d Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 5 Sep 2023 15:51:52 +0200 Subject: [PATCH 02/18] - Fixed data accounting issue [#25571] - Moved to maven-parent 1.2.0 and using parent version range [#25572] --- geoportal-service/CHANGELOG.md | 5 +++++ geoportal-service/pom.xml | 4 ++-- .../gcube/application/geoportal/service/RequestFilter.java | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index 09c6661..b18343e 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] + +- 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..e5a2a66 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) 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(); } } From da1c1502e0243e7b58c52c70f81a0f0d68bdd4f3 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 10:01:50 +0200 Subject: [PATCH 03/18] commented all modules --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 0dada55..3f10f32 100644 --- a/pom.xml +++ b/pom.xml @@ -81,34 +81,34 @@ - geoportal-service + - geoportal-common - cms-plugin-framework + + - geoportal-client + - default-lc-managers - sdi-plugins - notifications-plugins - dataminer-plugins - images-plugin - ckan-plugin + + + + + + - concessioni-lifecycle - concessioni-model + + - cms-test-commons - use-cases + + From 52ff58cbba3b046646dbff511aa88090cc1e8f03 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 10:59:21 +0200 Subject: [PATCH 04/18] - Using parent version range [#25572] --- concessioni-lifecycle/CHANGELOG.md | 3 +++ concessioni-lifecycle/pom.xml | 13 ++++++------- concessioni-model/CHANGELOG.md | 3 +++ concessioni-model/pom.xml | 12 ++++++------ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/concessioni-lifecycle/CHANGELOG.md b/concessioni-lifecycle/CHANGELOG.md index aee662b..dbfa1a2 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] +- 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..fc492df 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] +- 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 From 892ec092e18fd49d1a2d9b23ed60f9355ba52b29 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:01:06 +0200 Subject: [PATCH 05/18] activating modules `concessioni-lifecycle` and `concessioni-model` --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3f10f32..8aba63c 100644 --- a/pom.xml +++ b/pom.xml @@ -101,8 +101,8 @@ - - + concessioni-lifecycle + concessioni-model From 766861da37cdea5c0098c2726c154ee0c4a7331f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:06:56 +0200 Subject: [PATCH 06/18] Updated CHANGELOG --- concessioni-lifecycle/CHANGELOG.md | 2 +- concessioni-model/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/concessioni-lifecycle/CHANGELOG.md b/concessioni-lifecycle/CHANGELOG.md index dbfa1a2..5e8173b 100644 --- a/concessioni-lifecycle/CHANGELOG.md +++ b/concessioni-lifecycle/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog for org.gcube.application.cms.concessioni-lifecycle -## [v1.1.1-SNAPSHOT] +## [v1.1.1-SNAPSHOT] - 2023-09-06 - Using parent version range [#25572] ## [v1.1.0] - 2023-03-13 diff --git a/concessioni-model/CHANGELOG.md b/concessioni-model/CHANGELOG.md index fc492df..44e09d7 100644 --- a/concessioni-model/CHANGELOG.md +++ b/concessioni-model/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog for org.gcube.application.cms.concessioni-model -## [v1.0.4-SNAPSHOT] +## [v1.0.4-SNAPSHOT] - 2023-09-06 - Using parent version range [#25572] ## [v1.0.3] - 2023-01-10 From 5cb9b85c3265af9656504b0829e8b3a6f4003242 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:15:28 +0200 Subject: [PATCH 07/18] - Using parent version range [#25572] --- default-lc-managers/CHANGELOG.md | 3 +++ default-lc-managers/pom.xml | 13 ++++++------- notifications-plugins/CHANGELOG.md | 3 +++ notifications-plugins/pom.xml | 17 ++++++++--------- sdi-plugins/CHANGELOG.md | 3 +++ sdi-plugins/pom.xml | 7 +++---- 6 files changed, 26 insertions(+), 20 deletions(-) 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/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/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 From f70ba18eba3f0a2c621d4860161c638ccc90e77f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:16:39 +0200 Subject: [PATCH 08/18] activating modules: `default-lc-managers`, `sdi-plugins`, `notifications-plugins` --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8aba63c..77f6375 100644 --- a/pom.xml +++ b/pom.xml @@ -92,9 +92,9 @@ - - - + default-lc-managers + sdi-plugins + notifications-plugins From fb6f84f0fe58934f37bf9ce33225eeb861518e50 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:53:41 +0200 Subject: [PATCH 09/18] Using parent range version [#25572] --- cms-plugin-framework/CHANGELOG.md | 3 + cms-plugin-framework/pom.xml | 188 +++++++++++++++--------------- geoportal-client/CHANGELOG.md | 3 + geoportal-client/pom.xml | 6 +- geoportal-common/CHANGELOG.md | 3 + geoportal-common/pom.xml | 6 +- geoportal-service/CHANGELOG.md | 2 +- 7 files changed, 109 insertions(+), 102 deletions(-) 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/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..7a48eb8 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 version range [#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 b18343e..cd85486 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog for org.gcube.application.geoportal-service -## [v1.1.1-SNAPSHOT] +## [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] From e25a86306acb1d06281ccb71f66d114ea0e1de48 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:54:12 +0200 Subject: [PATCH 10/18] Using parent range version [#25572] --- geoportal-common/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geoportal-common/CHANGELOG.md b/geoportal-common/CHANGELOG.md index 7a48eb8..3d02cae 100644 --- a/geoportal-common/CHANGELOG.md +++ b/geoportal-common/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog for org.gcube.application.geoportal-common ## [v1.0.13-SNAPSHOT] - 2023-09-06 -- Using parent version range [#25572] +- Using parent range version [#25572] ## [v1.0.12] - 2023-05-11 - Integrated the PATCH method [#24985] From 564d6bb3cbfc5ad9b3a8ea7f0ec455f36c7b7718 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 11:54:54 +0200 Subject: [PATCH 11/18] activating modules: geoportal-service, geoportal-common, cms-plugin-framework, geoportal-client --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 77f6375..b7c1149 100644 --- a/pom.xml +++ b/pom.xml @@ -81,14 +81,14 @@ - + geoportal-service - - + geoportal-common + cms-plugin-framework - + geoportal-client From 35e99717171829303b2811b0534e9a59fa933328 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 14:03:17 +0200 Subject: [PATCH 12/18] commented profiles --- pom.xml | 80 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index b7c1149..1d89f10 100644 --- a/pom.xml +++ b/pom.xml @@ -23,52 +23,52 @@ https://code-repo.d4science.org/gCubeSystem - 2.3.0 - 2.4.0 - 3.7.0 - [1.0.0,2.0.0-SNAPSHOT) + + + + - - - - + 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT + 3.7.0-SNAPSHOT + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) 1.0.3 - - - 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.1.0-SNAPSHOT - 2.2.0-SNAPSHOT - 3.7.0-SNAPSHOT - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7fd3aad846eb981c699571110b5de36eb68d9926 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 14:07:31 +0200 Subject: [PATCH 13/18] added profiles. Updated plugin framework plugin-framework-version at [1.0.3, 1.5.0-SNAPSHOT) --- pom.xml | 94 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 1d89f10..1ffaef4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,52 +23,52 @@ https://code-repo.d4science.org/gCubeSystem - - - - + + + + - 2.1.0-SNAPSHOT - 2.2.0-SNAPSHOT - 3.7.0-SNAPSHOT - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - - 1.0.3 + + + + + + [1.0.3, 1.5.0-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.1.0-SNAPSHOT + 2.2.0-SNAPSHOT + 3.7.0-SNAPSHOT + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + + + @@ -95,9 +95,9 @@ default-lc-managers sdi-plugins notifications-plugins - - - + + + @@ -107,8 +107,8 @@ - - + + From 1109cdc63ccecad60b1b7bacfa93b776b187c591 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 14:15:27 +0200 Subject: [PATCH 14/18] plugin-framework-version at [1.0.0, 2.0.0-SNAPSHOT) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ffaef4..80bf414 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ - [1.0.3, 1.5.0-SNAPSHOT) + [1.0.0, 2.0.0-SNAPSHOT) From 5341f19cec2d323d667a3d3785e8f3e4693a5566 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 14:31:44 +0200 Subject: [PATCH 15/18] added plugin-framework-version 1.0.4-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80bf414..67193e4 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ - [1.0.0, 2.0.0-SNAPSHOT) + 1.0.4-SNAPSHOT From 028171275a2637fbb6babd0cde4a76df17024dbd Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 15:09:41 +0200 Subject: [PATCH 16/18] enabled default proprerties --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 67193e4..bbf7109 100644 --- a/pom.xml +++ b/pom.xml @@ -23,10 +23,10 @@ https://code-repo.d4science.org/gCubeSystem - - - - + 2.3.0 + 2.4.0 + 3.7.0 + [1.0.0,2.0.0-SNAPSHOT) @@ -95,6 +95,7 @@ default-lc-managers sdi-plugins notifications-plugins + From eaa48ca7995a9aa9e71bc9629a6b08eff08362d9 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 15:32:19 +0200 Subject: [PATCH 17/18] increased gcube-bom-version at 2.4.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bbf7109..ab5406e 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ - 2.1.0-SNAPSHOT + 2.4.0-SNAPSHOT 2.2.0-SNAPSHOT 3.7.0-SNAPSHOT [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) From 8616634652bec61f9b2e95807d9f0d89ba603462 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 6 Sep 2023 16:02:52 +0200 Subject: [PATCH 18/18] updated POM --- geoportal-service/pom.xml | 46 +++++++++++++++------------------------ 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index e5a2a66..66736ce 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -146,35 +146,14 @@ test - + @@ -201,6 +180,15 @@ + + + + src/main/resources + + **/* + + +