From d69345fce7bd035e6fa598c10ad56016d106cd92 Mon Sep 17 00:00:00 2001
From: Sean Busbey <sean.busbey@gmail.com>
Date: Sat, 9 Sep 2017 10:48:35 -0500
Subject: [PATCH] [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.
---
.travis.yml | 4 ++--
asynchbase/pom.xml | 13 +++++++++++++
elasticsearch5/pom.xml | 3 +++
pom.xml | 20 ++++++++++++++++++++
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 769d7f6a..e2062afa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ language: java
jdk:
- oraclejdk8
- - oraclejdk7
- openjdk7
install: mvn install -q -DskipTests=true
@@ -31,7 +30,8 @@ script: mvn test -q
# Services to start for tests.
services:
- mongodb
- - riak
+# temporarily disable riak. failing, docs offline.
+# - riak
# Use the Container based infrastructure.
diff --git a/asynchbase/pom.xml b/asynchbase/pom.xml
index 2a94ac8f..9bcf6c44 100644
--- a/asynchbase/pom.xml
+++ b/asynchbase/pom.xml
@@ -119,4 +119,17 @@ LICENSE file.
<scope>test</scope>
</dependency>
</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>
diff --git a/elasticsearch5/pom.xml b/elasticsearch5/pom.xml
index b537566f..5ab8cd35 100644
--- a/elasticsearch5/pom.xml
+++ b/elasticsearch5/pom.xml
@@ -34,6 +34,9 @@ LICENSE file.
<!-- For integration tests using ANT -->
<integ.http.port>9400</integ.http.port>
<integ.transport.port>9500</integ.transport.port>
+
+ <!-- If tests are skipped, skip ES spin up -->
+ <es.skip>${skipTests}</es.skip>
</properties>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index aab6c89c..7eea071d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,26 @@ LICENSE file.
</plugins>
</pluginManagement>
<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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
--
GitLab