bumped Version of geckoEMF (#285)

* fixed References in provider ecore Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz> * Fixed remaining references in the models Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz> * updated geckoEMF to 5.0 release version Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz> --------- Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
eclipse · Dec 10, 2023 · 9f9d680 · 9f9d680
1 parent 7ad4fa8
commit 9f9d680
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 31 deletions.
diff --git a/core/emf-api/dependency-check.bndrun b/core/emf-api/dependency-check.bndrun
@@ -14,7 +14,6 @@
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.14.0,2.14.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.14.0,2.14.1)',\
 	com.fasterxml.jackson.core.jackson-databind;version='[2.14.0,2.14.1)',\
-	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.apache.felix.scr;version='[2.2.2,2.2.3)',\
 	org.eclipse.emf.common;version='[2.28.0,2.28.1)',\
 	org.eclipse.emf.ecore;version='[2.33.0,2.33.1)',\
@@ -24,9 +23,7 @@
 	org.eclipse.sensinact.gateway.core.emf-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.core.geo-json;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.core.models.provider;version='[0.0.2,0.0.3)',\
-	org.gecko.emf.osgi.api;version='[4.6.2,4.6.3)',\
-	org.gecko.emf.osgi.component;version='[4.6.2,4.6.3)',\
+	org.gecko.emf.osgi.api;version='[5.0.0,5.0.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
-	org.osgi.util.converter;version='[1.0.9,1.0.10)',\
 	org.osgi.util.function;version='[1.1.0,1.1.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)'
diff --git a/core/models/metadata/src/main/resources/model/metadata.ecore b/core/models/metadata/src/main/resources/model/metadata.ecore
@@ -5,17 +5,17 @@
   <eAnnotations source="http://www.eclipse.org/OCL/Import">
     <details key="ecore" value="http://www.eclipse.org/emf/2002/Ecore"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="NexusMetadata" abstract="true" eSuperTypes="../../../../../provider/src/main/resources/model/sensinact.ecore#//Metadata">
+  <eClassifiers xsi:type="ecore:EClass" name="NexusMetadata" abstract="true" eSuperTypes="../../../../../org.eclipse.sensinact.gateway.core.models.provider/src/main/resources/model/sensinact.ecore#//Metadata">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="locked" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalName" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" unsettable="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AnnotationMetadata" eSuperTypes="#//NexusMetadata"/>
   <eClassifiers xsi:type="ecore:EClass" name="ResourceAttribute" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EAttribute #//NexusMetadata">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceType" eType="ecore:EEnum ../../../../../provider/src/main/resources/model/sensinact.ecore#//ResourceType"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceType" eType="ecore:EEnum ../../../../../org.eclipse.sensinact.gateway.core.models.provider/src/main/resources/model/sensinact.ecore#//ResourceType"
         defaultValueLiteral="SENSOR"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueType" eType="ecore:EEnum ../../../../../provider/src/main/resources/model/sensinact.ecore#//ValueType"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueType" eType="ecore:EEnum ../../../../../org.eclipse.sensinact.gateway.core.models.provider/src/main/resources/model/sensinact.ecore#//ValueType"
         defaultValueLiteral="MODIFIABLE"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalGet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalGetCacheMs" eType="ecore:EDataType ../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//ELong"
@@ -30,7 +30,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="ServiceReference" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EReference #//NexusMetadata"/>
   <eClassifiers xsi:type="ecore:EClass" name="Action" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EOperation #//NexusMetadata"/>
   <eClassifiers xsi:type="ecore:EClass" name="ActionParameter" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EParameter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="timestamp" eType="ecore:EDataType ../../../../../provider/src/main/resources/model/sensinact.ecore#//EInstant"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="timestamp" eType="ecore:EDataType ../../../../../org.eclipse.sensinact.gateway.core.models.provider/src/main/resources/model/sensinact.ecore#//EInstant"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ResourceMetadata" eSuperTypes="#//NexusMetadata"/>
   <eClassifiers xsi:type="ecore:EClass" name="ActionMetadata" eSuperTypes="#//NexusMetadata"/>

diff --git a/core/models/metadata/src/main/resources/model/metadata.genmodel b/core/models/metadata/src/main/resources/model/metadata.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.sensinact.core.model/src/main/java" modelPluginID="org.eclipse.sensinact.core.model"
     modelName="sensinact" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container$Dynamic$Permissive"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" suppressGenModelAnnotations="false"
-    copyrightFields="false" usedGenPackages="../../../../../provider/src/main/resources/model/sensinact.genmodel#//provider ../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
+    copyrightFields="false" usedGenPackages="../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../org.eclipse.sensinact.gateway.core.models.provider/src/main/resources/model/sensinact.genmodel#//provider"
     operationReflection="true" importOrganizing="true" oSGiCompatible="true">
   <foreignModel>metadata.ecore</foreignModel>
   <genPackages prefix="Metadata" basePackage="org.eclipse.sensinact.model.core" disposableProviderFactory="true"

diff --git a/core/models/provider/bnd.bnd b/core/models/provider/bnd.bnd
@@ -1,5 +0,0 @@
-Provide-Capability: \
-    org.eclipse.emf.ecore.generated_package;\
-        class="org.eclipse.sensinact.model.core.SensiNactPackage";\
-        uri="https://eclipse.org/sensinact/core/1.0";\
-        genModel="/model/sensinact.genmodel"

diff --git a/core/models/provider/src/main/resources/model/sensinact.genmodel b/core/models/provider/src/main/resources/model/sensinact.genmodel
@@ -4,8 +4,7 @@
     modelDirectory="/org.eclipse.sensinact.core.model/src" modelPluginID="org.eclipse.sensinact.core.model"
     modelName="sensinact" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container$Dynamic$Permissive"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" suppressGenModelAnnotations="false"
-    copyrightFields="false" usedGenPackages="../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    operationReflection="true" importOrganizing="true" oSGiCompatible="true">
+    copyrightFields="false" operationReflection="true" importOrganizing="true" oSGiCompatible="true">
   <foreignModel>sensinact.ecore</foreignModel>
   <genPackages prefix="Provider" basePackage="org.eclipse.sensinact.model.core" resource="XMI"
       disposableProviderFactory="true" ecorePackage="sensinact.ecore#/">

diff --git a/distribution/features/core-feature/src/main/resources/core-feature.json b/distribution/features/core-feature/src/main/resources/core-feature.json
@@ -17,8 +17,8 @@
     { "id": "org.eclipse.emf:org.eclipse.emf.ecore:2.33.0" },
     { "id": "org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.18.0" },
     { "id": "org.slf4j:log4j-over-slf4j:1.7.36" },
-    { "id": "org.geckoprojects.emf:org.gecko.emf.osgi.api:4.6.2" },
-    { "id": "org.geckoprojects.emf:org.gecko.emf.osgi.component:4.6.2" },
+    { "id": "org.geckoprojects.emf:org.gecko.emf.osgi.api:5.0.0" },
+    { "id": "org.geckoprojects.emf:org.gecko.emf.osgi.component:5.0.0" },
     { "id": "org.apache.aries.component-dsl:org.apache.aries.component-dsl.component-dsl:1.2.2" },
     { "id": "org.apache.aries.typedevent:org.apache.aries.typedevent.bus:0.0.2-SNAPSHOT" },
     { "id": "io.dropwizard.metrics:metrics-core:4.2.19" }

diff --git a/pom.xml b/pom.xml
@@ -119,7 +119,7 @@
     <osgi.typedevent.version>1.0.0</osgi.typedevent.version>
     <osgi.feature.version>1.0.0</osgi.feature.version>
     <osgi.converter.version>1.0.9</osgi.converter.version>
-    <gecko.emf.version>4.6.2</gecko.emf.version>
+    <gecko.emf.version>5.0.0</gecko.emf.version>
     <emf.common.version>2.28.0</emf.common.version>
     <emf.ecore.version>2.33.0</emf.ecore.version>
     <emf.ecore.xmi.version>2.18.0</emf.ecore.xmi.version>
@@ -184,17 +184,6 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>dim-nexus</id>
-      <name>Data In Motion Nexus</name>
-      <url>https://devel.data-in-motion.biz/nexus/repository/dim-release/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -209,7 +198,17 @@
         <enabled>true</enabled>
       </snapshots>
     </pluginRepository>
-
+    <pluginRepository>
+      <id>eclipse-dash</id>
+      <name>Eclipse Nexus</name>
+      <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
   </pluginRepositories>
 
   <dependencyManagement>