Merge branch '1.6' into 1.7
Conflicts:
.travis.yml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d3330e7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d3330e7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d3330e7
Branch: refs/heads/master
Commit: 2d3330e7ea07328c79ffa601afed4ad559591eac
Parents: c37ba87 99e3023
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Fri Apr 15 18:31:28 2016 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Fri Apr 15 18:31:28 2016 -0400
----------------------------------------------------------------------
.travis.yml | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d3330e7/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index b249511,64e44a2..5617017
--- a/.travis.yml
+++ b/.travis.yml
@@@ -13,8 -13,25 +13,24 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
language: java
+ notifications:
+ irc:
+ channels:
+ - "chat.freenode.net#accumulo"
+ use_notice: true
+ skip_join: true
+ # speed up builds; don't use with install
+ cache:
+ directories:
+ - $HOME/.m2
+ # skip pre-fetch of maven dependencies
+ install: true
jdk:
- - openjdk7
- - oraclejdk7
- oraclejdk8
- script: mvn clean verify -DskipITs
+ - oraclejdk7
+ - openjdk7
- - openjdk6
+ # clear any cache of accumulo artifacts, just in case; use https for central
+ before_script:
+ - rm -rf $HOME/.m2/repository/org/apache/accumulo
+ - echo "<settings
xmlns='http://maven.apache.org/SETTINGS/1.0.0'><mirrors><mirror><id>secure-central</id><url>https://repo.maven.apache.org/maven2</url><mirrorOf>central</mirrorOf></mirror></mirrors></settings>"
> $HOME/settings-custom.xml
+ script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs
