Merge pull request #167 from openworm/development

Release 1.1.0
openworm · Oct 23, 2019 · 1df3d41 · 1df3d41
2 parents 208d4c8 + 2f19e3e
commit 1df3d41
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>core</artifactId>
 	<name>Geppetto Core Bundle</name>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<github.global.server>github</github.global.server>

diff --git a/src/main/java/org/geppetto/core/manager/SharedLibraryManager.java b/src/main/java/org/geppetto/core/manager/SharedLibraryManager.java
@@ -23,7 +23,6 @@
 public class SharedLibraryManager
 {
 
-
 	private static LibraryManager manager;
 
 	private static GeppettoLibrary commonLibrary;
@@ -48,25 +47,25 @@ public synchronized static GeppettoLibrary getSharedCommonLibrary() throws Geppe
 			GeppettoPackage.Registry.INSTANCE.put(GeppettoPackage.eNS_URI, GeppettoPackage.eINSTANCE);
 
 			// We add all supported versions of the schema
-			String[] versions = new String[] { "master", "development" };
+			String[] versions = new String[] { "v1.1.0" };
 			for(String version : versions)
 			{
 				GeppettoPackage.Registry.INSTANCE.put(GeppettoPackage.eNS_URI_TEMPLATE.replace("$VERSION$", version), GeppettoPackage.eINSTANCE);
 			}
-			
+
 			ResourceSet resSet = new ResourceSetImpl();
 			Resource resource = resSet.createResource(URI.createURI("/GeppettoCommonLibrary.xmi"));
 			try
 			{
-				resource.load(SharedLibraryManager.class.getResourceAsStream("/GeppettoCommonLibrary.xmi"),null);
+				resource.load(SharedLibraryManager.class.getResourceAsStream("/GeppettoCommonLibrary.xmi"), null);
 			}
 			catch(IOException e)
 			{
 				throw new GeppettoInitializationException(e);
 			}
 			commonLibrary = (GeppettoLibrary) resource.getContents().get(0);
 			getLibraryManager().getLibraries().add(commonLibrary);
-		
+
 		}
 		return commonLibrary;
 	}

diff --git a/src/main/resources/GeppettoCommonLibrary.xmi b/src/main/resources/GeppettoCommonLibrary.xmi
@@ -3,8 +3,8 @@
     xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gep="https://raw.githubusercontent.com/openworm/org.geppetto.model/master/src/main/resources/geppettoModel.ecore"
-    xmlns:gep_1="https://raw.githubusercontent.com/openworm/org.geppetto.model/master/src/main/resources/geppettoModel.ecore#//types"
+    xmlns:gep="https://raw.githubusercontent.com/openworm/org.geppetto.model/v1.1.0/src/main/resources/geppettoModel.ecore"
+    xmlns:gep_1="https://raw.githubusercontent.com/openworm/org.geppetto.model/v1.1.0/src/main/resources/geppettoModel.ecore#//types"
     id="common"
     name="Geppetto Common Library">
   <types xsi:type="gep_1:ParameterType"
@@ -46,4 +46,13 @@
   <types xsi:type="gep_1:VisualType"
       id="particles"
       name="Particles"/>
+  <types xsi:type="gep_1:JSONType"
+      id="JSON"
+      name="JSON"/>
+  <types xsi:type="gep_1:SimpleArrayType"
+      id="simplearray"
+      name="Simple Array"/>
+  <types xsi:type="gep_1:MetadataType"
+      id="metadata"
+      name="Metadata"/>
 </gep:GeppettoLibrary>