diff --git a/concessioni-lifecycle/CHANGELOG.md b/concessioni-lifecycle/CHANGELOG.md index d31a592..0b6dca7 100644 --- a/concessioni-lifecycle/CHANGELOG.md +++ b/concessioni-lifecycle/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog for org.gcube.application.cms.concessioni-lifecycle +## [v1.0.4-SNAPSHOT] - 2023-03-03 +- [#24702] Fixed the default-lc-managers dependency + ## [v1.0.3] - 2023-01-10 - Pom updates - Fixes default access diff --git a/concessioni-lifecycle/pom.xml b/concessioni-lifecycle/pom.xml index f9595df..d942fb4 100644 --- a/concessioni-lifecycle/pom.xml +++ b/concessioni-lifecycle/pom.xml @@ -4,7 +4,7 @@ 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.0.3 + 1.0.4-SNAPSHOT GNA Concessioni Lifecycle @@ -44,6 +44,7 @@ org.gcube.application.cms default-lc-managers + provided diff --git a/default-lc-managers/CHANGELOG.md b/default-lc-managers/CHANGELOG.md index 7c9afa5..c463695 100644 --- a/default-lc-managers/CHANGELOG.md +++ b/default-lc-managers/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog for org.gcube.application.cms.ckan-plugin +## [v1.1.1-SNAPSHOT] - 2023-02-23 + +- [#24570] Integrated the UnPublish operation + ## [v1.0.1] - 2023-01-10 - Pom updates -- ## [v1.0.0] - 2022-02-24 +## [v1.0.0] - 2022-02-24 - First release This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). diff --git a/default-lc-managers/pom.xml b/default-lc-managers/pom.xml index 3d3ac25..55994a1 100644 --- a/default-lc-managers/pom.xml +++ b/default-lc-managers/pom.xml @@ -5,7 +5,7 @@ 4.0.0 default-lc-managers - 1.0.1 + 1.1.1-SNAPSHOT gCube CMS - Default LC Managers diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java index faddf7d..551e70f 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java @@ -1,12 +1,22 @@ package org.gcube.application.cms.plugins.implementations; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; +import java.util.HashMap; +import java.util.Map; + import org.gcube.application.cms.implementations.ProjectAccess; import org.gcube.application.cms.implementations.utils.UserUtils; import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.PluginManagerInterface; -import org.gcube.application.cms.plugins.faults.*; +import org.gcube.application.cms.plugins.faults.EventException; +import org.gcube.application.cms.plugins.faults.InitializationException; +import org.gcube.application.cms.plugins.faults.InsufficientPrivileges; +import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; +import org.gcube.application.cms.plugins.faults.InvalidProfileException; +import org.gcube.application.cms.plugins.faults.MaterializationException; +import org.gcube.application.cms.plugins.faults.ShutDownException; +import org.gcube.application.cms.plugins.faults.StepException; +import org.gcube.application.cms.plugins.faults.UnrecognizedEventException; +import org.gcube.application.cms.plugins.faults.UnrecognizedStepException; import org.gcube.application.cms.plugins.implementations.executions.GuardedEventManager; import org.gcube.application.cms.plugins.implementations.executions.GuardedStepExecution; import org.gcube.application.cms.plugins.reports.EventExecutionReport; @@ -25,10 +35,9 @@ import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor; import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; -import org.gcube.application.geoportal.common.utils.ContextUtils; -import java.util.HashMap; -import java.util.Map; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; @Slf4j public abstract class AbstractLifeCycleManager extends AbstractPlugin implements LifecycleManager { @@ -118,7 +127,12 @@ public abstract class AbstractLifeCycleManager extends AbstractPlugin implements @Override public StepExecutionReport performStep(StepExecutionRequest request) throws StepException, InvalidPluginRequestException, InvalidProfileException, ConfigurationException, InsufficientPrivileges { - log.info("Serving Request {}",request); + log.info("Serving Request - caller {}, ucd id {}, document id {}, step {}", + request.getCaller(), + request.getUseCaseDescriptor().getId(), + request.getDocument().getId(), + request.getStep()); + log.debug("Serving Request full log {}",request); log.debug("Checking is STEP {} is supported by {}",request.getStep(),DESCRIPTOR.getId()); if(!registeredSteps.containsKey(request.getStep())) diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java index c0fe6d7..5bee548 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java @@ -1,13 +1,13 @@ package org.gcube.application.cms.plugins.implementations; +import java.util.List; +import java.util.Map; + import org.gcube.application.cms.plugins.Plugin; import org.gcube.application.cms.plugins.faults.InvalidProfileException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; -import java.util.List; -import java.util.Map; - public abstract class AbstractPlugin implements Plugin { diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java index f27c8ad..57a5179 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java @@ -1,7 +1,7 @@ package org.gcube.application.cms.plugins.implementations; -import com.vdurmont.semver4j.Semver; -import lombok.extern.slf4j.Slf4j; +import java.util.Collections; + import org.bson.Document; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.LifecycleManager; @@ -13,33 +13,39 @@ import org.gcube.application.cms.plugins.implementations.executions.GuardedStepE import org.gcube.application.cms.plugins.reports.EventExecutionReport; import org.gcube.application.cms.plugins.reports.StepExecutionReport; import org.gcube.application.cms.plugins.requests.BaseRequest; +import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.configuration.Index; +import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.utils.Files; -import java.util.Collections; +import com.vdurmont.semver4j.Semver; + +import lombok.extern.slf4j.Slf4j; @Slf4j public class Default3PhaseManager extends SimpleLifeCycleManager implements LifecycleManager { protected static class Phases { public static final String PENDING_APPROVAL="Pending Approval"; - public static final String PUBLISHED="Published"; + public static final String PUBLISHED=SimpleLifeCycleManager.Phases.PUBLISHED; } - protected static class STEPS{ + public static final class STEPS{ public static final OperationDescriptor SUBMIT=new OperationDescriptor("SUBMIT-FOR-REVIEW","Submits the Draft for reviewing"); public static final OperationDescriptor REJECT=new OperationDescriptor("REJECT-DRAFT","Rejects the submitted Draft"); public static final OperationDescriptor APPROVE=new OperationDescriptor("APPROVE-SUBMITTED","Approves the submitted Draft"); + public static final OperationDescriptor UNPUBLISH = new OperationDescriptor("UNPUBLISH","UnPublish the project. DeMaterialize and DeIndex the project"); static { SUBMIT.setAppliableToPhases(Collections.singletonList(LifecycleInformation.CommonPhases.DRAFT_PHASE)); REJECT.setAppliableToPhases(Collections.singletonList(Phases.PENDING_APPROVAL)); APPROVE.setAppliableToPhases(Collections.singletonList(Phases.PENDING_APPROVAL)); + UNPUBLISH.setAppliableToPhases(Collections.singletonList(Phases.PUBLISHED)); } } @@ -92,6 +98,9 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life return executeReject(theReport); } }); + + //Updated by Francesco + setStep(d3PhaseUnPublishStep()); } public Default3PhaseManager() { @@ -100,6 +109,40 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life DESCRIPTOR.setVersion(new Semver("1.0.0")); DESCRIPTOR.setLabel("Default 3-Phase"); } + + //Updated by Francesco. DeIndexing (only) from PublicIndex and InternalIndex (GIS-CENTROIDS plugin with 'public' and "internal" flag) + protected GuardedStepExecution d3PhaseUnPublishStep() { + + return new GuardedStepExecution(STEPS.UNPUBLISH) { + @Override + protected StepExecutionReport run() throws Exception { + log.info( STEPS.UNPUBLISH+ " running..."); + //DeMaterialize + JSONPathWrapper wrapper = new JSONPathWrapper(theReport.getTheRequest().getDocument().getTheDocument().toJson()); + for (String s : wrapper.getMatchingPaths("$..[?(@." + RegisteredFileSet.PAYLOADS + ")]")){ + log.info("Requesting dematerialization for {} ",s); + for(MaterializationPlugin mat : getMaterializers(theReport.getTheRequest())) + theReport = deMaterialize(theReport,mat,new Document("fileSetPath",s)); + if(!theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) + break; + } + //DeIndex + if(theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) { + for(IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest())) { + log.info("Requesting deindexing for {} ",indexer.getDescriptor()); + theReport = deIndex(theReport,indexer,getPublicIndexParams(theReport.getTheRequest())); + theReport = deIndex(theReport,indexer,getInternalIndexParams(theReport.getTheRequest())); + } + } + + if(theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) + theReport.getToSetLifecycleInformation().setPhase(LifecycleInformation.CommonPhases.DRAFT_PHASE); + + + return theReport; + } + }; + } @Override @@ -122,6 +165,8 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life } return toReturn; } + + protected Document getInternalIndexParams(BaseRequest req){ Document callParameters = new Document(); diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java index ad5db3f..1d30152 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java @@ -1,16 +1,23 @@ package org.gcube.application.cms.plugins.implementations; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; -import lombok.extern.slf4j.Slf4j; +import java.util.HashMap; +import java.util.List; + +import javax.xml.bind.annotation.XmlRootElement; + import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.accounting.User; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; -import javax.xml.bind.annotation.XmlRootElement; -import java.util.HashMap; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.extern.slf4j.Slf4j; @Slf4j @ToString diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index e9e36f5..f2beee8 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -1,6 +1,9 @@ package org.gcube.application.cms.plugins.implementations; -import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.bson.Document; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.LifecycleManager; @@ -10,7 +13,12 @@ import org.gcube.application.cms.plugins.faults.IndexingException; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.implementations.executions.GuardedStepExecution; -import org.gcube.application.cms.plugins.reports.*; +import org.gcube.application.cms.plugins.reports.DocumentHandlingReport; +import org.gcube.application.cms.plugins.reports.EventExecutionReport; +import org.gcube.application.cms.plugins.reports.IndexDocumentReport; +import org.gcube.application.cms.plugins.reports.MaterializationReport; +import org.gcube.application.cms.plugins.reports.Report; +import org.gcube.application.cms.plugins.reports.StepExecutionReport; import org.gcube.application.cms.plugins.requests.BaseExecutionRequest; import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; @@ -28,9 +36,7 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDec import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.utils.Files; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import lombok.extern.slf4j.Slf4j; @Slf4j public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements LifecycleManager { @@ -41,14 +47,22 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements public SimpleLifeCycleManager() { DESCRIPTOR.setId(PLUGIN_ID); } + + //Updated by Francesco + protected static class Phases { + public static final String PUBLISHED="Published"; + public static final String UNPUBLISHED="UnPublished"; + } - + //Updated by Francesco private static class Steps { public static final OperationDescriptor PUBLISH = new OperationDescriptor("PUBLISH","Materialize & index project"); + public static final OperationDescriptor UNPUBLISH = new OperationDescriptor("UNPUBLISH","UnPublish the project. DeMaterialize and DeIndex the project"); static{ PUBLISH.setAppliableToPhases(Collections.singletonList(LifecycleInformation.CommonPhases.DRAFT_PHASE)); + UNPUBLISH.setAppliableToPhases(Collections.singletonList(Phases.PUBLISHED)); } } @@ -112,13 +126,45 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements theReport = index(theReport,indexer,getPublicIndexParams(theReport.getTheRequest())); // setPhase if(theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) - theReport.getToSetLifecycleInformation().setPhase("PUBLISHED"); + //TODO CHANGED THE SET PHASE ID + //theReport.getToSetLifecycleInformation().setPhase("PUBLISHED"); + theReport.getToSetLifecycleInformation().setPhase(Phases.PUBLISHED); } return theReport; } }); - } + + //Updated by Francesco. DeIndexing (only) from PublicIndexParams (GIS-CENTROIDS plugin with 'public' flag) + setStep(new GuardedStepExecution(Steps.UNPUBLISH) { + @Override + protected StepExecutionReport run() throws Exception { + log.info(Steps.UNPUBLISH+ " running..."); + //DeMaterialize + JSONPathWrapper wrapper = new JSONPathWrapper(theReport.getTheRequest().getDocument().getTheDocument().toJson()); + for (String s : wrapper.getMatchingPaths("$..[?(@." + RegisteredFileSet.PAYLOADS + ")]")){ + log.info("Requesting dematerialization for {} ",s); + for(MaterializationPlugin mat : getMaterializers(theReport.getTheRequest())) + theReport = deMaterialize(theReport,mat,new Document("fileSetPath",s)); + if(!theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) + break; + } + //DeIndex + if(theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) { + for(IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest())) { + log.info("Requesting deindexing for {} ",indexer.getDescriptor()); + theReport = deIndex(theReport,indexer,getPublicIndexParams(theReport.getTheRequest())); + } + } + + if(theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) + theReport.getToSetLifecycleInformation().setPhase(LifecycleInformation.CommonPhases.DRAFT_PHASE); + + return theReport; + } + }); + } + protected void blockNonDraft(EventExecutionReport report) throws InvalidPluginRequestException { Boolean force = false; try { diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java index eabc58c..4239382 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java @@ -1,11 +1,12 @@ package org.gcube.application.cms.plugins.implementations.executions; -import lombok.NonNull; -import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.plugins.reports.EventExecutionReport; import org.gcube.application.cms.plugins.requests.EventExecutionRequest; import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor; +import lombok.NonNull; +import lombok.extern.slf4j.Slf4j; + @Slf4j public abstract class GuardedEventManager extends GuardedExecution{ diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java index 6d73209..35688f5 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java @@ -1,9 +1,5 @@ package org.gcube.application.cms.plugins.implementations.executions; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.plugins.faults.InsufficientPrivileges; import org.gcube.application.cms.plugins.faults.StepException; import org.gcube.application.cms.plugins.reports.DocumentHandlingReport; @@ -12,6 +8,11 @@ import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; +import lombok.Getter; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + @Slf4j @RequiredArgsConstructor @@ -28,14 +29,14 @@ public abstract class GuardedExecution{ @@ -16,7 +18,7 @@ public abstract class GuardedStepExecution extends GuardedExecution4.0.0 org.gcube.application geoportal-service - 1.0.12 + 1.0.13-SNAPSHOT Geoportal Service war diff --git a/geoportal-service/src/main/webapp/docs/css/d4science_enunciate_custom.css b/geoportal-service/src/main/webapp/api-docs/css/d4science_enunciate_custom.css similarity index 94% rename from geoportal-service/src/main/webapp/docs/css/d4science_enunciate_custom.css rename to geoportal-service/src/main/webapp/api-docs/css/d4science_enunciate_custom.css index 9dae183..48a9abd 100644 --- a/geoportal-service/src/main/webapp/docs/css/d4science_enunciate_custom.css +++ b/geoportal-service/src/main/webapp/api-docs/css/d4science_enunciate_custom.css @@ -6,6 +6,7 @@ padding: 10px; background: white; width: 100%; + height: 100px; } .navbar-fixed-top { diff --git a/notifications-plugins/CHANGELOG.md b/notifications-plugins/CHANGELOG.md index e151a7a..a68a226 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.3-SNAPSHOT] - 2023-03-03 +- [#24702] Fixed the default-lc-managers dependency + ## [v1.0.2] - 2023-01-10 - Pom updates diff --git a/notifications-plugins/pom.xml b/notifications-plugins/pom.xml index 108061c..56d72e4 100644 --- a/notifications-plugins/pom.xml +++ b/notifications-plugins/pom.xml @@ -5,7 +5,7 @@ 4.0.0 notifications-plugins - 1.0.2 + 1.0.3-SNAPSHOT gCube CMS - Notifications Plugins @@ -54,6 +54,7 @@ org.gcube.application.cms default-lc-managers + provided org.gcube.application.cms diff --git a/pom.xml b/pom.xml index c3f4017..8e7add4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -22,16 +23,16 @@ https://code-repo.d4science.org/gCubeSystem - 2.0.2 - 2.1.1 - 3.6.3 - [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 @@ -75,10 +76,10 @@ cms-test-commons - use-cases + use-cases - + @@ -164,7 +165,7 @@ - + org.gcube.application.cms @@ -287,37 +288,37 @@ - + - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - flatten-maven-plugin - [1.0.0,) - - flatten - - - - - false - - - - - - - - - + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + flatten-maven-plugin + [1.0.0,) + + flatten + + + + + false + + + + + + + + + org.codehaus.mojo diff --git a/sdi-plugins/CHANGELOG.md b/sdi-plugins/CHANGELOG.md index c401260..9e89d81 100644 --- a/sdi-plugins/CHANGELOG.md +++ b/sdi-plugins/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for org.gcube.application.cms.sdi-plugins +## [v1.0.4-SNAPSHOT] - 2023-03-02 +- Fixed the import from joda-time to java.time +- [#24702] Fixed the default-lc-managers dependency + ## [v1.0.3] - 2023-01-24 - Fixes [#24476](https://support.d4science.org/issues/24476) diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index 24d34e6..97794d1 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -1,116 +1,117 @@ - 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"> + 4.0.0 - sdi-plugins - 1.0.3 - gCube CMS - SDI Plugins + sdi-plugins + 1.0.4-SNAPSHOT + gCube CMS - SDI Plugins - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - + + org.gcube.application.cms + gcube-cms-suite + 1.0.4 + - - https://code-repo.d4science.org/gCubeSystem - + + https://code-repo.d4science.org/gCubeSystem + - - - - org.gcube.application.cms - cms-plugin-framework - ${plugin-framework-version} - pom - import - - - + + + + org.gcube.application.cms + cms-plugin-framework + ${plugin-framework-version} + pom + import + + + - - 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.application.cms - cms-plugin-framework - + + + org.gcube.application.cms + cms-plugin-framework + - - org.gcube.application.cms - default-lc-managers - + + org.gcube.application.cms + default-lc-managers + provided + - - - 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) + - - - net.postgis - postgis-jdbc - 2.5.0 - + + + net.postgis + postgis-jdbc + 2.5.0 + - + - - de.grundid.opendatalab - geojson-jackson - 1.14 - + + de.grundid.opendatalab + geojson-jackson + 1.14 + - - org.gcube.application.cms - cms-test-commons - test - + + org.gcube.application.cms + cms-test-commons + test + - + - - + + - - org.apache.maven.plugins - maven-assembly-plugin - - - make-uberjar - package - - - make-servicearchive - package - - - + + org.apache.maven.plugins + maven-assembly-plugin + + + make-uberjar + package + + + make-servicearchive + package + + + - - + + diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java index ed76f92..e07ddb8 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java @@ -1,5 +1,11 @@ package org.gcube.application.cms.sdi; +import static org.junit.Assume.assumeTrue; + +import java.sql.SQLException; +import java.time.Instant; +import java.util.List; + import org.gcube.application.cms.implementations.ISInterface; import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.cms.plugins.faults.InvalidProfileException; @@ -8,24 +14,14 @@ import org.gcube.application.cms.sdi.engine.PostgisTable; import org.gcube.application.cms.sdi.engine.SDIManagerWrapper; import org.gcube.application.cms.sdi.faults.SDIInteractionException; import org.gcube.application.cms.sdi.model.MappingObject; -import org.gcube.application.cms.sdi.plugins.SDIIndexerPlugin; import org.gcube.application.cms.tests.TestProfiles; import org.gcube.application.cms.tests.model.BasicTests; -import org.gcube.application.cms.tests.plugins.BasicPluginTest; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; -import org.joda.time.Instant; -import org.joda.time.format.DateTimeFormatter; import org.junit.Test; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.List; - -import static org.junit.Assume.assumeTrue; - public class LayerCreationTest extends BasicTests { diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java index 9df7895..650be7d 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java @@ -1,5 +1,7 @@ package org.gcube.application.cms.sdi.plugins; +import java.io.IOException; + import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; @@ -9,8 +11,6 @@ import org.geojson.LngLatAlt; import org.geojson.Point; import org.junit.Test; -import java.io.IOException; - public class GeoJSONTests { @Test diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java index c4b9d41..7b98a57 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java @@ -1,6 +1,12 @@ package org.gcube.application.cms.sdi.plugins; -import com.fasterxml.jackson.core.JsonProcessingException; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertNotNull; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assume.assumeTrue; + +import java.util.Arrays; + import org.bson.Document; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.faults.PluginExecutionException; @@ -25,10 +31,7 @@ import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import java.util.Arrays; - -import static junit.framework.TestCase.*; -import static org.junit.Assume.assumeTrue; +import com.fasterxml.jackson.core.JsonProcessingException; public class IndexerTest extends BasicPluginTest { diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java index cef51f2..4e91dd6 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java @@ -1,6 +1,11 @@ package org.gcube.application.cms.sdi.plugins; -import com.fasterxml.jackson.core.JsonProcessingException; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assume.assumeTrue; + +import java.io.File; +import java.io.IOException; + import org.bson.Document; import org.gcube.application.cms.plugins.faults.PluginExecutionException; import org.gcube.application.cms.plugins.reports.MaterializationReport; @@ -20,11 +25,7 @@ import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import java.io.File; -import java.io.IOException; - -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assume.assumeTrue; +import com.fasterxml.jackson.core.JsonProcessingException; public class MaterializerTests extends BasicPluginTest {