Merge pull request #599 from openworm/development

Release 0.4.1
openworm · Sep 4, 2018 · 995a4b1 · 995a4b1
2 parents 54a78a5 + 0310faa
commit 995a4b1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/geppetto.plan b/geppetto.plan
@@ -7,11 +7,11 @@
             http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd">
 
 
-    <artifact type="bundle" name="org.geppetto.model" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.core" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.simulation" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.frontend" version="0.4.0"/>
+    <artifact type="bundle" name="org.geppetto.model" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.core" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.simulation" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.frontend" version="0.4.1"/>
 
 
 </plan>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>org.geppetto</artifactId>
 	<name>Geppetto</name>
-	<version>0.4.0</version>
+	<version>0.4.1</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>../org.geppetto.model</module>

diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile
@@ -71,12 +71,12 @@ RUN sudo mv /home/developer/workspace/org.geppetto/utilities/docker/geppetto-per
 COPY geppetto.plan workspace/org.geppetto/
 
 RUN sudo chmod -R 777 workspace;
-RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development && mvn --quiet install;
-RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development && mvn --quiet install;
-RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development && mvn --quiet install;
-RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development && mvn --quiet install;
-RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch && mvn --quiet install;
-RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout $persistenceBranch && mvn --quiet install;
+RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development && mvn -Dhttps.protocols=TLSv1.2 --quiet install;
+RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development && mvn -Dhttps.protocols=TLSv1.2 --quiet install;
+RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development && mvn -Dhttps.protocols=TLSv1.2 --quiet install;
+RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development && mvn -Dhttps.protocols=TLSv1.2 --quiet install;
+RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch && mvn -Dhttps.protocols=TLSv1.2 --quiet install;
+RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout $persistenceBranch && mvn -Dhttps.protocols=TLSv1.2 --quiet install;
 
 #END GET GEPPETTO SOURCES
 
@@ -113,9 +113,9 @@ RUN service mysql start && mysql -uroot < /home/developer/geppetto/init.sql
 #END SETUP MYSQL INITIAL DATA
 
 USER developer
-RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install --quiet && mvn install --quiet
+RUN cd /home/developer/workspace/org.geppetto.persistence && mvn -Dhttps.protocols=TLSv1.2 install --quiet && mvn -Dhttps.protocols=TLSv1.2 install --quiet
 
-RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime
+RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn -Dhttps.protocols=TLSv1.2 exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime
 
 #END INSTALL MYSQL
 

diff --git a/utilities/docker/geppetto-persistence/geppetto.plan b/utilities/docker/geppetto-persistence/geppetto.plan
@@ -7,18 +7,18 @@
             http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd">
 
 
-    <artifact type="bundle" name="org.geppetto.model" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.core" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.persistence" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.simulation" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.frontend" version="0.4.0"/>
+    <artifact type="bundle" name="org.geppetto.model" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.core" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.persistence" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.simulation" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.frontend" version="0.4.1"/>
 
     <!-- 
-    <artifact type="bundle" name="org.geppetto.simulator.external" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.datasources" version="0.4.0"/>
-    <artifact type="bundle" name="org.geppetto.model.nwb" version="0.4.0"/> 
-    <artifact type="bundle" name="org.geppetto.testbackend" version="0.4.0"/> -->
+    <artifact type="bundle" name="org.geppetto.simulator.external" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.datasources" version="0.4.1"/>
+    <artifact type="bundle" name="org.geppetto.model.nwb" version="0.4.1"/> 
+    <artifact type="bundle" name="org.geppetto.testbackend" version="0.4.1"/> -->
 
 
 

diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile
@@ -65,7 +65,7 @@ RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulatio
 RUN cd workspace && cd org.geppetto.simulation && git checkout $frontendBranch ; exit 0
 RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch
 RUN sudo chmod -R 777 workspace \
-    && cd workspace/org.geppetto && mvn --quiet install 
+    && cd workspace/org.geppetto && mvn -Dhttps.protocols=TLSv1.2 --quiet install 
 #END GET GEPPETTO SOURCES
 
 RUN mkdir -p geppetto/