Skip to content

Commit

Permalink
Merge pull request #306 from dfoulkes/JENKINS-60658
Browse files Browse the repository at this point in the history
JENKINS-60658
  • Loading branch information
patbos committed Mar 5, 2020
2 parents 04d7810 + 5e8789c commit ef3ad85
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -9,7 +9,6 @@ notifications:
secure: phVNsiDfu5nDM7okqhGgX1Qhh3Sawqy5X3p5bgDarh9RX82V2OAebyiiKiw6aNGyDCoD0ElMHmz7tbdBODsR3muWyoQ5EJBsDgNv1NM9dhkdeIQ/182bF7EBFciPW5SYjl0+dOkIeMn9DHdg8i0RVxwjy6GjJX2r/6oUmYxExQk=
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "sed 's/localhost.localdomain localhost/localhost localhost.localdomain/' /etc/hosts > /tmp/etchostsfile && cat /tmp/etchostsfile | sudo tee /etc/hosts"
- echo "MAVEN_OPTS='-Xmx2g -XX:MaxPermSize=1024m'" > ~/.mavenrc
- wget -N http://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
Expand All @@ -20,6 +19,8 @@ before_install:
script:
- "if [[ -z $TRAVIS_TAG ]]; then mvn --batch-mode -Dwebdriver.chrome.driver=/usr/local/share/chromedriver install; fi"
- "if [[ -n $TRAVIS_TAG ]]; then ./release.sh master $TRAVIS_TAG; fi"
services:
- xvfb
cache:
directories:
- $HOME/.m2
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
Expand Up @@ -500,7 +500,11 @@
<version>1.3.2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.5</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>commons-beanutils</groupId>
Expand Down

0 comments on commit ef3ad85

Please sign in to comment.