Skip to content

Commit 6d3a9f8

Browse files
viniciusamviniciusam
committed
Code cleanup
1 parent 9162ffa commit 6d3a9f8

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

‎.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ services:
66

77
jdk:
88
- oraclejdk7
9-
# - oraclejdk8
9+
- oraclejdk8
1010

1111
env:
1212
global:
1313
- DOCKER_CFG=$HOME/.docker
1414
- DOCKER_REPO="viniciusam/oracledb"
15-
# - MAVEN_HOME=$HOME/apache-maven
1615
- MAVEN_HOME=/usr/local/maven
1716
- UTPLSQL_VERSION="v3.0.0-beta"
1817
- UTPLSQL_FILE="utPLSQLv3.0.0.562-beta"
@@ -23,12 +22,12 @@ cache:
2322
directories:
2423
- $DOCKER_CFG
2524
- $HOME/.m2
26-
- $MAVEN_HOME/lib/ext
25+
- $MAVEN_HOME/lib/ext # Used to cache wagon-http lib.
2726

2827
install:
2928
- bash .travis/maven_cfg.sh
30-
# - bash .travis/start_db.sh
31-
# - bash .travis/install_utplsql.sh
29+
- bash .travis/start_db.sh
30+
- bash .travis/install_utplsql.sh
3231

3332
script:
34-
- mvn test -B
33+
- mvn test -B

‎.travis/maven_cfg.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ set -ev
33
cd $(dirname $(readlink -f $0))
44

55
mavenSettings=$HOME/.m2/settings.xml
6+
mavenCached=$HOME/.m2/.cached
67

7-
if [ -d $mavenSettings ]; then
8+
if [ -f $mavenCached ]; then
89
echo "Using cached maven user config..."
910
exit 0
1011
fi
@@ -14,19 +15,14 @@ if [ "$ORACLE_OTN_USER" == "" ] || [ "$ORACLE_OTN_PASSWORD" == "" ]; then
1415
exit 1
1516
fi
1617

17-
# If not cached, download and install maven.
18-
# Then create the settings file, with username/password for oracle server.
19-
# curl -L -O "http://mirror.nbtelecom.com.br/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz"
20-
# tar -xzf apache-maven-3.3.9-bin.tar.gz
21-
# mv apache-maven-3.3.9 $MAVEN_HOME
22-
# rm apache-maven-3.3.9-bin.tar.gz
23-
18+
# Download wagon-http recommended by Oracle.
19+
# On maven latest version this is not needed, but travis doesn't have it.
2420
curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar"
2521
sudo mv wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
2622

27-
# MAVEN_CFG=$MAVEN_HOME/conf/settings.xml
23+
# Create the settings file with oracle server config.
2824
cp settings.tmpl.xml $mavenSettings
2925
sed -i -e "s|###USERNAME###|$ORACLE_OTN_USER|g" $mavenSettings
3026
sed -i -e "s|###PASSWORD###|$ORACLE_OTN_PASSWORD|g" $mavenSettings
3127

32-
# $MAVEN_HOME/bin/mvn -v
28+
touch $mavenCached

0 commit comments

Comments
 (0)