Merge branch 'master' into development

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2011, 2017 Geppetto authors
+Copyright © 2011, 2019 Geppetto authors
 http://geppetto.org
 
 All rights reserved. This program and the accompanying materials

utilities/docker/geppetto-persistence/Dockerfile

@@ -6,9 +6,9 @@ ENV aKey=${aKey}
 ARG sKey
 ENV sKey=${sKey}
 
-ARG targetBranch=development
-ARG originBranch=development
-ARG defaultBranch=development
+ARG targetBranch=master
+ARG originBranch=master
+ARG defaultBranch=master
 RUN /bin/echo -e "\e[1;35mORIGIN BRANCH ------------ $originBranch\e[0m" &&\
   /bin/echo -e "\e[1;35mTARGET BRANCH ------------ $targetBranch\e[0m" &&\
   /bin/echo -e "\e[1;35mDEFAULT BRANCH ------------ $defaultBranch\e[0m"

utilities/docker/geppetto/Dockerfile

@@ -2,9 +2,9 @@ FROM metacell/java-virgo-maven:development
 
 LABEL maintainer="Facundo Rodriguez <[email protected]>"
 
-ARG targetBranch=development
-ARG originBranch=development
-ARG defaultBranch=development
+ARG targetBranch=master
+ARG originBranch=master
+ARG defaultBranch=master
 
 RUN /bin/echo -e "\e[1;35mORIGIN BRANCH ------------ $originBranch\e[0m" &&\
   /bin/echo -e "\e[1;35mTARGET BRANCH ------------ $targetBranch\e[0m" &&\
@@ -59,5 +59,6 @@ WORKDIR $HOME
 RUN mkdir rm $SERVER_HOME/./repository/usr
 RUN cd $HOME/workspace/org.geppetto/utilities/source_setup && python update_server.py
 
+
 EXPOSE 8080
 CMD [ "/bin/bash", "-c", "$SERVER_HOME/bin/startup.sh" ]

utilities/docker/livegeppetto/Dockerfile

@@ -2,9 +2,9 @@ FROM metacell/java-virgo-maven:development
 
 LABEL maintainer="Facundo Rodriguez <[email protected]>"
 
-ARG targetBranch=development
-ARG originBranch=development
-ARG defaultBranch=development
+ARG targetBranch=master
+ARG originBranch=master
+ARG defaultBranch=master
 
 RUN /bin/echo -e "\e[1;35mORIGIN BRANCH ------------ $originBranch\e[0m" &&\
   /bin/echo -e "\e[1;35mTARGET BRANCH ------------ $targetBranch\e[0m" &&\