From 74ce2eb6a33c694e86f146f156f67a04541b61fc Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 21 Jun 2022 17:33:27 +0200 Subject: [PATCH] Harmonized poms --- ckan-plugin/pom.xml | 4 ++-- cms-plugin-framework/pom.xml | 2 +- cms-test-commons/pom.xml | 4 ++-- concessioni-lifecycle/pom.xml | 2 +- dataminer-plugins/pom.xml | 4 ++-- geoportal-client/pom.xml | 2 +- geoportal-common/pom.xml | 1 - images-plugin/pom.xml | 4 ++-- notifications-plugins/pom.xml | 4 ++-- pom.xml | 2 ++ sdi-plugins/pom.xml | 4 ++-- .../profiledDocuments/profiles/Concessioni.json | 12 ++++++------ use-cases/pom.xml | 4 ++-- 13 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ckan-plugin/pom.xml b/ckan-plugin/pom.xml index a038652..d4f7687 100644 --- a/ckan-plugin/pom.xml +++ b/ckan-plugin/pom.xml @@ -32,14 +32,14 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import org.gcube.application.cms cms-plugin-framework - 1.0.1-SNAPSHOT + ${plugin-framework-version} pom import diff --git a/cms-plugin-framework/pom.xml b/cms-plugin-framework/pom.xml index d40dcf8..4dff7f4 100644 --- a/cms-plugin-framework/pom.xml +++ b/cms-plugin-framework/pom.xml @@ -32,7 +32,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import diff --git a/cms-test-commons/pom.xml b/cms-test-commons/pom.xml index ec91167..3f1da89 100644 --- a/cms-test-commons/pom.xml +++ b/cms-test-commons/pom.xml @@ -33,14 +33,14 @@ org.gcube.distribution gcube-bom - 2.0.2 + ${gcube-bom-version} pom import org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import diff --git a/concessioni-lifecycle/pom.xml b/concessioni-lifecycle/pom.xml index 9caa029..969f42c 100644 --- a/concessioni-lifecycle/pom.xml +++ b/concessioni-lifecycle/pom.xml @@ -33,7 +33,7 @@ org.gcube.application.cms cms-plugin-framework - 1.0.1-SNAPSHOT + ${plugin-framework-version} pom import diff --git a/dataminer-plugins/pom.xml b/dataminer-plugins/pom.xml index 5598cde..57b4af7 100644 --- a/dataminer-plugins/pom.xml +++ b/dataminer-plugins/pom.xml @@ -20,14 +20,14 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import org.gcube.application.cms cms-plugin-framework - 1.0.1-SNAPSHOT + ${plugin-framework-version} pom import diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index a9f486d..77d0123 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -50,7 +50,7 @@ org.gcube.common common-jaxrs-client - [1.0.0,2.0.0) + [1.0.0,2.0.0-SNAPSHOT) diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml index 51639f9..8420922 100644 --- a/geoportal-common/pom.xml +++ b/geoportal-common/pom.xml @@ -16,7 +16,6 @@ https://code-repo.d4science.org/gCubeSystem 1.0 - diff --git a/images-plugin/pom.xml b/images-plugin/pom.xml index 2d68c48..22dd91e 100644 --- a/images-plugin/pom.xml +++ b/images-plugin/pom.xml @@ -21,14 +21,14 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import org.gcube.application.cms cms-plugin-framework - 1.0.1-SNAPSHOT + ${plugin-framework-version} pom import diff --git a/notifications-plugins/pom.xml b/notifications-plugins/pom.xml index db97c45..a379039 100644 --- a/notifications-plugins/pom.xml +++ b/notifications-plugins/pom.xml @@ -24,14 +24,14 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import org.gcube.application.cms cms-plugin-framework - 1.0.1-SNAPSHOT + ${plugin-framework-version} pom import diff --git a/pom.xml b/pom.xml index 3ddf9b3..3743f8e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,8 @@ 2.2.0-SNAPSHOT 3.7.0-SNAPSHOT [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + 1.0.1-SNAPSHOT + diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index 69fba39..3172959 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -26,14 +26,14 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import org.gcube.application.cms cms-plugin-framework - 1.0.1-SNAPSHOT + ${plugin-framework-version} pom import diff --git a/test-data/profiledDocuments/profiles/Concessioni.json b/test-data/profiledDocuments/profiles/Concessioni.json index b3b8cf3..2c6bfc0 100644 --- a/test-data/profiledDocuments/profiles/Concessioni.json +++ b/test-data/profiledDocuments/profiles/Concessioni.json @@ -116,12 +116,12 @@ "filePaths": [ { "gcubeProfileFieldName": "Carica Abstract Ita (in PDF)", - "fieldDefinition": "abstractRelazione.children[?(@.filesetIta)]", + "fieldDefinition": "$.abstractRelazione.children[?(@.filesetIta)]", "fieldName": "filesetIta" }, { "gcubeProfileFieldName": "Carica Abstract Eng (in PDF)", - "fieldDefinition": "abstractRelazione.children[?(@.filesetEng)]", + "fieldDefinition": "$.abstractRelazione.children[?(@.filesetEng)]", "fieldName": "filesetEng" } ] @@ -135,7 +135,7 @@ "filePaths": [ { "gcubeProfileFieldName": "Relazione di fine scavo (in PDF)", - "fieldDefinition": "relazioneScavo.children[?(@.fileset)]", + "fieldDefinition": "$.relazioneScavo.children[?(@.fileset)]", "fieldName": "fileset" } ] @@ -151,7 +151,7 @@ "filePaths": [ { "gcubeProfileFieldName": "Immagine", - "fieldDefinition": "immaginiRappresentative.children[?(@.fileset)]", + "fieldDefinition": "$.immaginiRappresentative.children[?(@.fileset)]", "fieldName": "fileset" } ] @@ -165,7 +165,7 @@ "filePaths": [ { "gcubeProfileFieldName": "File", - "fieldDefinition": "posizionamentoScavo.children[?(@.fileset)]", + "fieldDefinition": "$.posizionamentoScavo.children[?(@.fileset)]", "fieldName": "fileset" } ] @@ -181,7 +181,7 @@ "filePaths": [ { "gcubeProfileFieldName": "File", - "fieldDefinition": "pianteFineScavo.children[?(@.fileset)]", + "fieldDefinition": "$.pianteFineScavo.children[?(@.fileset)]", "fieldName": "fileset" } ] diff --git a/use-cases/pom.xml b/use-cases/pom.xml index 5579278..eb93992 100644 --- a/use-cases/pom.xml +++ b/use-cases/pom.xml @@ -30,14 +30,14 @@ org.gcube.distribution gcube-bom - 2.0.2 + ${gcube-bom-version} pom import org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import