You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/10/26 17:14:04 UTC
[1/3] incubator-beam git commit: Closes #1180
Repository: incubator-beam
Updated Branches:
refs/heads/master 78e2c0387 -> 7091a0120
Closes #1180
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7091a012
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7091a012
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7091a012
Branch: refs/heads/master
Commit: 7091a0120e070335c24198d5f297a9fcff25fe75
Parents: 78e2c03 3af2c1e
Author: Dan Halperin <dh...@google.com>
Authored: Wed Oct 26 10:13:59 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Oct 26 10:13:59 2016 -0700
----------------------------------------------------------------------
.travis.yml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-beam git commit: Revert "Fix invalid snapshot repo in
Travis CI's maven settings.xml"
Posted by dh...@apache.org.
Revert "Fix invalid snapshot repo in Travis CI's maven settings.xml"
This reverts commit fbc23ed9234088c9d88bf88b19a3a4d6d5e52446.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/3c71e4da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/3c71e4da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/3c71e4da
Branch: refs/heads/master
Commit: 3c71e4da3490c599436d71ac344354c5fa8b693f
Parents: 78e2c03
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 24 19:31:26 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Oct 26 10:13:59 2016 -0700
----------------------------------------------------------------------
.travis.yml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3c71e4da/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 277f883..b11f61b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,10 +44,6 @@ matrix:
env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
before_install:
- # Workaround for https://github.com/travis-ci/travis-ci/issues/4629
- - cat ~/.m2/settings.xml
- - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
- - cat ~/.m2/settings.xml
- echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc
- echo $'MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd\'T\'HH:mm:ss.SSS"' >> ~/.mavenrc
- cat ~/.mavenrc
[2/3] incubator-beam git commit: Set up Maven settings globally for
Travis CI builds
Posted by dh...@apache.org.
Set up Maven settings globally for Travis CI builds
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/3af2c1e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/3af2c1e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/3af2c1e7
Branch: refs/heads/master
Commit: 3af2c1e7336d4856cc80827d39f244eb4b1ceadc
Parents: 3c71e4d
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 24 19:34:04 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Oct 26 10:13:59 2016 -0700
----------------------------------------------------------------------
.travis.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3af2c1e7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b11f61b..5b271d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,16 +32,16 @@ matrix:
include:
# On OSX, run with default JDK only.
- os: osx
- env: MAVEN_OVERRIDE=""
+ env: MAVEN_OVERRIDE="--settings=.travis/settings.xml"
# On Linux, run with specific JDKs only.
- os: linux
- env: CUSTOM_JDK="oraclejdk8" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
+ env: CUSTOM_JDK="oraclejdk8" MAVEN_OVERRIDE="--settings=.travis/settings.xml -DbeamSurefireArgline='-Xmx512m'"
- os: linux
- env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
+ env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="--settings=.travis/settings.xml -DbeamSurefireArgline='-Xmx512m'"
- os: linux
- env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m' -Peclipse-jdt"
+ env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="--settings=.travis/settings.xml -DbeamSurefireArgline='-Xmx512m' -Peclipse-jdt"
- os: linux
- env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="-DbeamSurefireArgline='-Xmx512m'"
+ env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="--settings=.travis/settings.xml -DbeamSurefireArgline='-Xmx512m'"
before_install:
- echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc
@@ -56,7 +56,7 @@ install:
- rm -rf "$HOME/.m2/repository/org/apache/beam"
script:
- - travis_retry mvn --settings .travis/settings.xml --batch-mode --update-snapshots --no-snapshot-updates $MAVEN_OVERRIDE verify
+ - travis_retry mvn --batch-mode --update-snapshots --no-snapshot-updates $MAVEN_OVERRIDE verify
- travis_retry .travis/test_wordcount.sh
cache: