Merge pull request #896 from openworm/development

Patch: Permissive dependency on geppetto bundles [1.0,2.0)

.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
   - 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

pom.xml

@@ -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>
@@ -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>