From 6c0263efbf2cf9f3377cada663062dfb263923cb Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Tue, 14 May 2019 10:22:12 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e88313ab3..d998806b8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/openworm/geppetto-application.svg?branch=master)](https://travis-ci.org/openworm/geppetto-application) +[![Build Status](https://travis-ci.org/openworm/org.geppetto.frontend.svg?branch=development)](https://travis-ci.org/openworm/org.geppetto.frontend)

Geppetto logo From fc991fbebd07a106210d2fdf48185a128a2aac06 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Wed, 28 Aug 2019 12:14:28 +0100 Subject: [PATCH 2/5] Update .travis.yml --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17d71a44f..931d65982 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,9 @@ script: - echo "$TRAVIS_BRANCH" - git clone https://github.com/openworm/geppetto-application.git webapp - cd webapp + - git clone https://github.com/openworm/geppetto-client.git webapp - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out development ..." && git checkout development; fi - - cd ../../.. - - mvn install \ No newline at end of file + - cd geppetto-client + - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out development ..." && git checkout development; fi + - cd ../../../.. + - mvn install From 282543429521fef8de6c3846de50d04b55bcfd81 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Wed, 28 Aug 2019 12:19:07 +0100 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 931d65982..0d2e4c2d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ script: - echo "$TRAVIS_BRANCH" - git clone https://github.com/openworm/geppetto-application.git webapp - cd webapp - - git clone https://github.com/openworm/geppetto-client.git webapp + - git clone https://github.com/openworm/geppetto-client.git - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out development ..." && git checkout development; fi - cd geppetto-client - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out development ..." && git checkout development; fi From 7ff69c54ca6a8e95c2f469eba5e194074122f18a Mon Sep 17 00:00:00 2001 From: rodriguez-facundo Date: Wed, 23 Oct 2019 14:14:57 -0300 Subject: [PATCH 4/5] Add flexible version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 39016d8f0..302fd1ada 100644 --- a/pom.xml +++ b/pom.xml @@ -125,12 +125,12 @@ org.geppetto core - ${project.version} + [1.0, 2.0) org.geppetto simulation - ${project.version} + [1.0, 2.0) org.apache.tomcat From 7d76ac8f4883b0e9434eaff43f783bac783d716c Mon Sep 17 00:00:00 2001 From: rodriguez-facundo Date: Wed, 23 Oct 2019 14:46:18 -0300 Subject: [PATCH 5/5] update version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 302fd1ada..cf5cf055b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.geppetto frontend - 1.0.0 + 1.0.1 Geppetto Frontend war