From dc203c062c19ef5a860582bd404fac45b8a8fddd Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 22 Jun 2018 12:40:36 +0100 Subject: [PATCH 1/4] Test to upgrade TSL protocol version --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 76384415..f87021ac 100644 --- 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/ From 10395d984fd43712506f770c071d0ab505421371 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 22 Jun 2018 12:50:42 +0100 Subject: [PATCH 2/4] Upgrade TSL protocol to 1.2 (see https://blogs.apache.org/maven/entry/notice-java-6-and-7) --- utilities/docker/geppetto-persistence/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 0c114be5..c8c6f3d6 100644 --- 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,7 +113,7 @@ 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 From 047800d972f2f98c0f2bcfdd5e4c0672f18cc12f Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 22 Jun 2018 13:50:23 +0100 Subject: [PATCH 3/4] Missing upgrade --- utilities/docker/geppetto-persistence/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index c8c6f3d6..aa935826 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -115,7 +115,7 @@ RUN service mysql start && mysql -uroot < /home/developer/geppetto/init.sql USER developer 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 From 0310faaba634734881c50b867da4fb77e8bbfdd1 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Tue, 4 Sep 2018 15:23:04 +0100 Subject: [PATCH 4/4] Release 0.4.1 --- geppetto.plan | 10 +++++----- pom.xml | 2 +- .../docker/geppetto-persistence/geppetto.plan | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/geppetto.plan b/geppetto.plan index 1ef19ef0..bed96de5 100644 --- a/geppetto.plan +++ b/geppetto.plan @@ -7,11 +7,11 @@ http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd"> - - - - - + + + + + diff --git a/pom.xml b/pom.xml index 5d4c05bf..356b4a52 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.geppetto org.geppetto Geppetto - 0.4.0 + 0.4.1 pom ../org.geppetto.model diff --git a/utilities/docker/geppetto-persistence/geppetto.plan b/utilities/docker/geppetto-persistence/geppetto.plan index dd287f83..3354e8d5 100644 --- 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"> - - - - - - + + + + + + + + + + -->