Skip to content
Snippets Groups Projects
Commit d69345fc authored by Sean Busbey's avatar Sean Busbey Committed by GitHub
Browse files

[travis] get travis back to happy (#1022)

* Set minimum maven version to 3.1.0+, due to reqs for ES testing
* remove oracle jdk7 per travis-ci/travis-ci#7884
* Skip ES5 cluster spin-up if tests are skipped.
* Increase test heap for asynchbase binding from Travis 2048m to 4096m
  - https://docs.travis-ci.com/user/build-environment-updates/2017-09-06/
* temporarily remove the riak service on travis
  - currently fails w/o details
  - http://docs.basho.com/ fails to load, so I can't spin up a test node locally.
parent a9f5c045
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,6 @@ language: java ...@@ -21,7 +21,6 @@ language: java
jdk: jdk:
- oraclejdk8 - oraclejdk8
- oraclejdk7
- openjdk7 - openjdk7
install: mvn install -q -DskipTests=true install: mvn install -q -DskipTests=true
...@@ -31,7 +30,8 @@ script: mvn test -q ...@@ -31,7 +30,8 @@ script: mvn test -q
# Services to start for tests. # Services to start for tests.
services: services:
- mongodb - mongodb
- riak # temporarily disable riak. failing, docs offline.
# - riak
# Use the Container based infrastructure. # Use the Container based infrastructure.
......
...@@ -119,4 +119,17 @@ LICENSE file. ...@@ -119,4 +119,17 @@ LICENSE file.
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<configuration>
<argLine>-Xms4096m -Xms4096m</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -34,6 +34,9 @@ LICENSE file. ...@@ -34,6 +34,9 @@ LICENSE file.
<!-- For integration tests using ANT --> <!-- For integration tests using ANT -->
<integ.http.port>9400</integ.http.port> <integ.http.port>9400</integ.http.port>
<integ.transport.port>9500</integ.transport.port> <integ.transport.port>9500</integ.transport.port>
<!-- If tests are skipped, skip ES spin up -->
<es.skip>${skipTests}</es.skip>
</properties> </properties>
<build> <build>
<plugins> <plugins>
......
...@@ -163,6 +163,26 @@ LICENSE file. ...@@ -163,6 +163,26 @@ LICENSE file.
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.1.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment