Skip to content
This repository was archived by the owner on Dec 12, 2018. It is now read-only.

Commit c02c07c

Browse files
committed
Use Travis CI dist precise
Allow script in javadoc header Removing maven quite flag to add more logging Work around travis-ci/travis-ci#5227 by hacking up /etc/hosts
1 parent 697cd69 commit c02c07c

File tree

5 files changed

+34
-9
lines changed

5 files changed

+34
-9
lines changed

.travis.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
language: java
2-
sudo: false
3-
jdk:
4-
- openjdk7
5-
- oraclejdk7
6-
- oraclejdk8
2+
dist: precise
73
addons:
84
apt:
95
packages:
@@ -20,3 +16,17 @@ after_success:
2016
notifications:
2117
slack:
2218
secure: INiA7V4aXvimkImaErVH94ZSmFNuOgun9aurmf3BiE2Qq0EfNiEaWK9pp6hfkv+wSls4LXNDLaYVzdoMECVLh+Dv9VLHIABnaNEmMStXUlyZ+sOpdayl/47gnNr0G1cr06eqbikGVqWtQaxDz2Psaejq2D/6WYw5Vnqk4BjWQHw=
19+
20+
matrix:
21+
include:
22+
- os: linux
23+
sudo: required
24+
jdk: openjdk7
25+
- os: linux
26+
sudo: false
27+
dist: precise
28+
jdk: oraclejdk7
29+
- os: linux
30+
sudo: false
31+
dist: precise
32+
jdk: oraclejdk8

ci/before_install.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ source ./ci/common.sh
44

55
./ci/travis_bootstrap.sh
66

7+
# if openjdk7 then hackup the hostname to prevent a buffer overflow travis-ci/travis-ci#5227
8+
if [ $TRAVIS_JDK_VERSION == 'openjdk7' ]
9+
then
10+
echo "\nOriginal /etc/hosts:"
11+
cat /etc/hosts
12+
sudo hostname "$(hostname | cut -c1-63)"
13+
sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
14+
echo "\nNew /etc/hosts:"
15+
cat /etc/hosts
16+
echo ""
17+
fi
18+
719
cp id_rsa_stormpath.github.io "$HOME/.ssh/id_rsa"
820
chmod 600 "$HOME/.ssh/id_rsa"
921
mkdir -p "$HOME/.stormpath/clover"
@@ -24,4 +36,7 @@ echo "Version: $RELEASE_VERSION"
2436
echo "Is release: ${IS_RELEASE:-false}"
2537
echo "Build documentation: ${BUILD_DOCS:-false}"
2638
echo "Running IT tests: ${RUN_ITS:-false}"
39+
echo "which java: $(which java)"
40+
echo "mvn --version:"
41+
mvn --version
2742

ci/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source ./ci/common.sh
44

55
if [ -n "$RUN_ITS" ]; then
66
info "Running unit and IT tests..."
7-
(mvn -s ci/settings.xml -Pclover.all -q install &> $WORKDIR/target/tests.log) &
7+
(mvn -s ci/settings.xml -Pclover.all install &> $WORKDIR/target/tests.log) &
88
PID=$!
99
show_spinner "$PID"
1010

@@ -20,7 +20,7 @@ fi
2020

2121
if [ -z "$RUN_ITS" ]; then
2222
info "Running unit tests..."
23-
(mvn -s ci/settings.xml -q install &> $WORKDIR/target/tests.log) &
23+
(mvn -s ci/settings.xml install &> $WORKDIR/target/tests.log) &
2424
PID=$!
2525
show_spinner "$PID"
2626

ci/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ "$EXIT_CODE" -ne 0 ]; then
2222
fi
2323

2424
info "Generating JavaDocs..."
25-
(mvn -s ci/settings.xml -q javadoc:aggregate -P travis-docs &> $WORKDIR/target/javadocs.log) &
25+
(mvn -s ci/settings.xml javadoc:aggregate -P travis-docs &> $WORKDIR/target/javadocs.log) &
2626
PID=$!
2727

2828
show_spinner "$PID"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@
771771
<properties>
772772
<!-- Issue 84: JDK 8 requires strict HTML. We'll disable this strictness until we can
773773
clean up the HTML source in JavaDoc comments: -->
774-
<additionalparam>-Xdoclint:none</additionalparam>
774+
<additionalparam>-Xdoclint:none --allow-script-in-comments</additionalparam>
775775
</properties>
776776
</profile>
777777
<profile>

0 commit comments

Comments
 (0)