From 5e1f72fcc35696432a2c7447e463f02711f3cbc8 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 21 Nov 2018 10:23:19 +0000 Subject: [PATCH] Upgraded version after release 4.13.0 refs #11948 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/is-exporter-se-plugin@174297 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 5 ++++- pom.xml | 2 +- .../exporter/mapper/ServiceEndpointExporter.java | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index a2f865b..a8f5efd 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,7 +1,10 @@ - + + + + Using resource-regsitry v2 apis #11949 diff --git a/pom.xml b/pom.xml index 87c6e1b..2cecdec 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.information-system is-exporter-se-plugin - 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT IS Exporter Exports GenericReosurce and ServiceEndpoint from gCoreIS to Resource Registry diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java index 70624ed..2b2de6f 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java @@ -12,12 +12,10 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Runtime; import org.gcube.common.resources.gcore.common.Platform; import org.gcube.common.resources.gcore.utils.Group; import org.gcube.informationsystem.model.impl.embedded.HeaderImpl; -import org.gcube.informationsystem.model.impl.embedded.ValueSchemaImpl; import org.gcube.informationsystem.model.impl.relation.ConsistsOfImpl; import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; import org.gcube.informationsystem.model.impl.utils.ISMapper; import org.gcube.informationsystem.model.reference.embedded.Header; -import org.gcube.informationsystem.model.reference.embedded.ValueSchema; import org.gcube.informationsystem.model.reference.entity.Facet; import org.gcube.informationsystem.model.reference.entity.Resource; import org.gcube.informationsystem.model.reference.relation.ConsistsOf; @@ -28,11 +26,13 @@ import org.gcube.resourcemanagement.model.impl.entity.facet.AccessPointFacetImpl import org.gcube.resourcemanagement.model.impl.entity.facet.NetworkingFacetImpl; import org.gcube.resourcemanagement.model.impl.entity.facet.ServiceStateFacetImpl; import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.properties.ValueSchemaImpl; import org.gcube.resourcemanagement.model.impl.entity.resource.EServiceImpl; import org.gcube.resourcemanagement.model.reference.entity.facet.AccessPointFacet; import org.gcube.resourcemanagement.model.reference.entity.facet.NetworkingFacet; import org.gcube.resourcemanagement.model.reference.entity.facet.ServiceStateFacet; import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.properties.ValueSchema; import org.gcube.resourcemanagement.model.reference.entity.resource.EService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -269,7 +269,7 @@ public class ServiceEndpointExporter extends GCoreResourceMapper