Skip to content

Commit

Permalink
Merge pull request #896 from openworm/development
Browse files Browse the repository at this point in the history
Patch: Permissive dependency on geppetto bundles [1.0,2.0)
  • Loading branch information
tarelli committed Oct 24, 2019
2 parents ace9864 + bebcc0d commit 36e76bf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- 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
- 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
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.geppetto</groupId>
<artifactId>frontend</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<name>Geppetto Frontend</name>
<packaging>war</packaging>
<properties>
Expand Down Expand Up @@ -125,12 +125,12 @@
<dependency>
<groupId>org.geppetto</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<version>[1.0, 2.0)</version>
</dependency>
<dependency>
<groupId>org.geppetto</groupId>
<artifactId>simulation</artifactId>
<version>${project.version}</version>
<version>[1.0, 2.0)</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Expand Down

0 comments on commit 36e76bf

Please sign in to comment.