Merge pull request #427 from openworm/development

Release 0.2.4
openworm · Jul 13, 2015 · 5b3a749 · 5b3a749
2 parents 3204a22 + ebc5cd5
commit 5b3a749
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/geppetto.plan b/geppetto.plan
@@ -6,14 +6,14 @@
             http://www.springsource.org/schema/dm-server/plan
             http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd">
 
-    <artifact type="bundle" name="org.geppetto.core" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.model.sph" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.solver.sph" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.simulator.sph" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.simulator.jlems" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.testbackend" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.simulation" version="0.2.3"/>
-    <artifact type="bundle" name="org.geppetto.frontend" version="0.2.3"/>
+    <artifact type="bundle" name="org.geppetto.core" version="0.2.4"/>
+    <!-- <artifact type="bundle" name="org.geppetto.model.sph" version="0.2.4"/> -->
+    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.2.4"/>
+    <!-- <artifact type="bundle" name="org.geppetto.solver.sph" version="0.2.4"/>
+    <artifact type="bundle" name="org.geppetto.simulator.sph" version="0.2.4"/>
+    <artifact type="bundle" name="org.geppetto.simulator.jlems" version="0.2.4"/>
+    <artifact type="bundle" name="org.geppetto.testbackend" version="0.2.4"/> -->
+    <artifact type="bundle" name="org.geppetto.simulation" version="0.2.4"/>
+    <artifact type="bundle" name="org.geppetto.frontend" version="0.2.4"/>
 
 </plan>
diff --git a/pom.xml b/pom.xml
@@ -4,17 +4,12 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>org.geppetto</artifactId>
 	<name>Geppetto</name>
-	<version>0.2.3</version>
+	<version>0.2.4</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>../org.geppetto.core</module>
-		<module>../org.geppetto.model.sph</module>
 		<module>../org.geppetto.model.neuroml</module>
-		<module>../org.geppetto.solver.sph</module>
-		<module>../org.geppetto.simulator.sph</module>
-		<module>../org.geppetto.simulator.jlems</module>
 		<module>../org.geppetto.simulation</module>
 		<module>../org.geppetto.frontend</module>
-		<module>../org.geppetto.testbackend</module>
 	</modules>
-</project>
+</project>
diff --git a/utilities/release/build_server_package.py b/utilities/release/build_server_package.py
@@ -57,17 +57,11 @@
 except IOError as e:
    sys.exit("Can't find mvn under " + os.environ['MAVEN_HOME'] + "-- is MAVEN_HOME set appropriately?")
 
-virgo_version = "3.6.2.RELEASE"
-
-urls = ["http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/%s/virgo-tomcat-server-%s.zip&mirror_id=96&r=1"%(virgo_version, virgo_version)]
+virgo_version = "3.6.3.RELEASE"
+urls = ["https://dl.dropboxusercontent.com/u/7538688/virgo-tomcat-server-3.6.3.RELEASE.zip?dl=1"]
 
 openwormpackages = ['org.geppetto.core',
-'org.geppetto.model.sph',
 'org.geppetto.model.neuroml',
-'org.geppetto.solver.sph',
-'org.geppetto.simulator.sph',
-'org.geppetto.simulator.jlems',
-'org.geppetto.testbackend',
 'org.geppetto.simulation',
 'org.geppetto.frontend',
 'org.geppetto']

diff --git a/utilities/source_setup/config.json b/utilities/source_setup/config.json
@@ -34,6 +34,14 @@
 			"name":"org.geppetto.testbackend",
 			"url":"https://github.com/openworm/org.geppetto.testbackend.git"
 		},
+		{
+			"name":"org.geppetto.persistence",
+			"url":"https://github.com/openworm/org.geppetto.persistence.git"
+		},
+		{
+			"name":"org.geppetto.simulator.external",
+			"url":"https://github.com/openworm/org.geppetto.simulator.external.git"
+		},
 		{
 			"name":"org.geppetto.frontend",
 			"url":"https://github.com/openworm/org.geppetto.frontend.git"