You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/09/26 18:50:14 UTC
nifi git commit: Backport NIFI-2728 to 0.x tree. This closes #1061
Repository: nifi
Updated Branches:
refs/heads/0.x 5ddf1d70b -> 4e6f9d396
Backport NIFI-2728 to 0.x tree. This closes #1061
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4e6f9d39
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4e6f9d39
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4e6f9d39
Branch: refs/heads/0.x
Commit: 4e6f9d39652f78db5840129ea5d49eddffb62e0e
Parents: 5ddf1d7
Author: Andre F de Miranda <tr...@users.noreply.github.com>
Authored: Mon Sep 26 23:40:23 2016 +1000
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Sep 26 14:49:44 2016 -0400
----------------------------------------------------------------------
.travis.yml | 31 +++++++++++++++++++++++++++++--
pom.xml | 2 +-
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4e6f9d39/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b5c02d0..4ffef5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
language: java
os:
@@ -8,12 +23,24 @@ jdk:
- oraclejdk7
- openjdk7
+# Caches mvn repository in order to speed upbuilds
+cache:
+ directories:
+ - $HOME/.m2
+ - $HOME/.npm
+
# before_install aids in a couple workarounds for issues within the Travis-CI environment
# 1. Workaround for buffer overflow issues with OpenJDK versions of java as per https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165135711
# 2. Workaround for non-existent Maven repository as per: https://github.com/travis-ci/travis-ci/issues/4629#issuecomment-131214465
before_install:
- sudo hostname "$(hostname | cut -c1-63)"
- - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
+ - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts > /tmp/hosts
+ - sudo mv /tmp/hosts /etc/hosts
- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
+# - echo "MAVEN_OPTS='-Xmx2g -XX:+UseG1GC'" > ~/.mavenrc
+ - mvn apache-rat:check
-script: mvn clean install -Pcontrib-check
+install:
+ - mvn -q -DskipTests=true clean install
+script:
+ - mvn -Pcontrib-check verify
http://git-wip-us.apache.org/repos/asf/nifi/blob/4e6f9d39/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5e71b92..ac4f0c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1302,7 +1302,7 @@ language governing permissions and limitations under the License. -->
<version>2.18</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <argLine combine.children="append">-Xmx1G -Djava.net.preferIPv4Stack=true</argLine>
+ <argLine combine.children="append">-Xmx2G -Djava.net.preferIPv4Stack=true</argLine>
</configuration>
<dependencies>
<dependency>