Merge pull request #64 from openworm/development

Release 1.0.0

.travis.yml

@@ -9,32 +9,14 @@ env:
   global:
     secure: dn0FPQ5IG4M/3kdwnyI78ElQ308Vc3QnKAvkWfwMFb8QxDqxQdnTo7AV1qTMtbLrDNkeEWIgi4nc7jmXNtvGTwOfhAULVh6606Qs5B+ezTdwzajbbFMI8SKQx/pnTojOMu8dx7V4lMoR/YWcojR0VC1IWVC62TGbSB1k5BDGgH0=
 before_install:
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update
-  - sudo apt-get -y install docker-ce
-  - docker version
   - sudo apt-get install -y xserver-xorg-dev libxext-dev libxi-dev 
 install:
-- git clone https://github.com/openworm/org.geppetto.model.git
-- cd org.geppetto.model
-- if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the model bundle, checking out development ..." && git checkout development; fi
-- git status
-- mvn install
-- cd ..
-- git clone https://github.com/openworm/org.geppetto.core.git
-- cd org.geppetto.core
-- if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the core bundle, checking out development ..." && git checkout development; fi
-- git status
-- mvn install
-- cd ..
-- git clone https://github.com/openworm/org.geppetto.frontend.git
-- cd org.geppetto.frontend
-- cd ..
+- git clone https://github.com/openworm/geppetto-application.git
 - npm install --silent -g phantomjs 
 - npm install --silent -g casperjs 
 - npm install --silent -g slimerjs
 - npm install --silent -g gl
+- npm config set registry http://registry.npmjs.org/
 
 services:
   - docker
@@ -61,8 +43,8 @@ script:
   - phantomjs -v
   - docker --version
   - casperjs --version
-  - cd org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs
-  - travis_retry docker build -t="geppetto_persistence" --build-arg mainBranch=$TRAVIS_BRANCH --build-arg aKey=$accessKey --build-arg sKey=$secretKey https://github.com/openworm/org.geppetto.git#master:utilities/docker/geppetto-persistence/
+  - cd geppetto-application/tests/casperjs
+  - travis_retry docker build -t="geppetto_persistence" --build-arg targetBranch=$TRAVIS_BRANCH --build-arg originBranch=$TRAVIS_PULL_REQUEST_BRANCH --build-arg defaultBranch=development --build-arg aKey=$accessKey --build-arg sKey=$secretKey https://github.com/openworm/org.geppetto.git#issue-travis:utilities/docker/geppetto-persistence/
   - travis_retry docker run -d --name geppetto_persistence_container -p 28081:8080 geppetto_persistence;
   - bash utilities/test_geppetto_server.sh
   - sleep 60
@@ -91,4 +73,4 @@ script:
   - sudo docker logs -t geppetto_persistence_container
   - docker ps -a;
   - docker stop $(docker ps -a -q)
-  - docker rm $(docker ps -a -q)
+  - docker rm $(docker ps -a -q)

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>persistence</artifactId>
 	<name>Geppetto Persistence Bundle</name>
-	<version>0.4.2</version>
+	<version>1.0.0</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<spring.version>4.3.9.RELEASE</spring.version>