Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.4.1 #599

Merged
merged 4 commits into from
Sep 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions geppetto.plan
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions utilities/docker/geppetto-persistence/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
20 changes: 10 additions & 10 deletions utilities/docker/geppetto-persistence/geppetto.plan
Original file line number Diff line number Diff line change
Expand Up @@ -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"/> -->



Expand Down
2 changes: 1 addition & 1 deletion utilities/docker/geppetto/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down