Browse Source

Re-enable and fix jdk6 travis tests

pull/2/head
Travis Burtrum 5 years ago
parent
commit
6988a438ba
  1. 34
      .travis.yml
  2. 9
      .travis/dl_java6_maven.sh
  3. 2
      .travis/oracle/download.sh
  4. 2
      common/pom.xml
  5. 2
      jdbcmapper/pom.xml
  6. 2
      querymapper/pom.xml
  7. 2
      test/pom.xml

34
.travis.yml

@ -46,20 +46,23 @@ script: @@ -46,20 +46,23 @@ script:
matrix:
include:
# - env: JDK='OpenJDK 6'
# addons:
# apt:
# packages:
# - openjdk-6-jdk
# script:
# # java6 doesn't support ms-sql at all, and doesn't support h2 with ANY
# - mvn -Dhttps.protocols=TLSv1.2 -B -pl '!test' clean install || travis_terminate 1;
# - mvn -B -pl test clean test -DjdbcMapper.databaseType=BIND --settings .travis-settings.xml -P oracle '-DjdbcUrl1=jdbc:postgresql:test_db' '-DjdbcUrl2=jdbc:mariadb://127.0.0.1:3306/test_db?user=root' '-DjdbcUrl3=jdbc:oracle:thin:travis_test/travis_test@127.0.0.1:1521/xe' || travis_terminate 1;
# - mvn -B -pl test clean test -DjdbcMapper.databaseType=BIND -DqueryMapper.databaseType=OPTIMAL --settings .travis-settings.xml -P oracle '-DjdbcUrl1=jdbc:postgresql:test_db' '-DjdbcUrl2=jdbc:mariadb://127.0.0.1:3306/test_db?user=root' '-DjdbcUrl3=jdbc:oracle:thin:travis_test/travis_test@127.0.0.1:1521/xe' || travis_terminate 1;
# - mvn -B -pl test clean test -DjdbcMapper.databaseType=ANY '-DjdbcUrl=jdbc:postgresql:test_db' || travis_terminate 1;
# - mvn -B -pl test clean test -DjdbcMapper.databaseType=ORACLE --settings .travis-settings.xml -P oracle '-DjdbcUrl=jdbc:oracle:thin:travis_test/travis_test@127.0.0.1:1521/xe' || travis_terminate 1;
# - mvn -B -pl test clean test -DjdbcMapper.databaseType=UNNEST '-DjdbcUrl=hsqldb' || travis_terminate 1;
# jdk: openjdk6
- env: JDK='OpenJDK 6'
addons:
apt:
packages:
- openjdk-6-jdk
- ca-certificates-java
- openjdk-7-jre-headless
script:
# java6 doesn't support ms-sql at all, and doesn't support h2 with ANY
- .travis/dl_java6_maven.sh
- mvn --offline -B -pl '!test' clean install || travis_terminate 1;
- mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=BIND --settings .travis-settings.xml -P oracle '-DjdbcUrl1=jdbc:postgresql:test_db' '-DjdbcUrl2=jdbc:mariadb://127.0.0.1:3306/test_db?user=root' '-DjdbcUrl3=jdbc:oracle:thin:travis_test/travis_test@127.0.0.1:1521/xe' || travis_terminate 1;
- mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=BIND -DqueryMapper.databaseType=OPTIMAL --settings .travis-settings.xml -P oracle '-DjdbcUrl1=jdbc:postgresql:test_db' '-DjdbcUrl2=jdbc:mariadb://127.0.0.1:3306/test_db?user=root' '-DjdbcUrl3=jdbc:oracle:thin:travis_test/travis_test@127.0.0.1:1521/xe' || travis_terminate 1;
- mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=ANY '-DjdbcUrl=jdbc:postgresql:test_db' || travis_terminate 1;
- mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=ORACLE --settings .travis-settings.xml -P oracle '-DjdbcUrl=jdbc:oracle:thin:travis_test/travis_test@127.0.0.1:1521/xe' || travis_terminate 1;
- mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=UNNEST '-DjdbcUrl=hsqldb' || travis_terminate 1;
jdk: openjdk6
- env: JDK='OpenJDK 7'
jdk: openjdk7
script:
@ -98,7 +101,7 @@ install: @@ -98,7 +101,7 @@ install:
export CUSTOM_MVN_VERION="3.2.5";
echo "Download Maven ${CUSTOM_MVN_VERION}....";
export M2_HOME=$HOME/.traviscache/apache-maven-${CUSTOM_MVN_VERION};
[ -d $M2_HOME ] || wget https://archive.apache.org/dist/maven/maven-3/${CUSTOM_MVN_VERION}/binaries/apache-maven-${CUSTOM_MVN_VERION}-bin.zip;
[ -d $M2_HOME ] || wget -q https://archive.apache.org/dist/maven/maven-3/${CUSTOM_MVN_VERION}/binaries/apache-maven-${CUSTOM_MVN_VERION}-bin.zip;
[ -d $M2_HOME ] || unzip -qq apache-maven-${CUSTOM_MVN_VERION}-bin.zip;
[ -d $M2_HOME ] || mv apache-maven-${CUSTOM_MVN_VERION} $M2_HOME;
export PATH=$M2_HOME/bin:$PATH;
@ -109,6 +112,7 @@ after_success: @@ -109,6 +112,7 @@ after_success:
- if [ "${JDK}" == 'OpenJDK 8' ] || [ "${JDK}" == 'OpenJDK 6' ]; then
mvn deploy --settings .travis-settings.xml -DskipTests=true -B || travis_terminate 1;
fi
- rm -rf $HOME/.m2/repository/com/moparisthebest/jdbcmapper
cache:
directories:

9
.travis/dl_java6_maven.sh

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
#!/bin/bash
# maven central only supports TLS 1.2+ now, and java 6 does not, ouch, use java 7 to download them...
set -e
JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 mvn -B -Dhttps.protocols=TLSv1.2 --settings .travis-settings.xml -P oracle clean install
JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 mvn --offline -B clean
git checkout -- .
git clean -dxf
rm -rf ~/.m2/repository/com/moparisthebest/jdbcmapper

2
.travis/oracle/download.sh

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
#!/bin/bash
if [[ ! -f $HOME/.traviscache/oracle-xe-11.2.0-1.0.x86_64.rpm.zip ]]
then
wget -O $HOME/.traviscache/oracle-xe-11.2.0-1.0.x86_64.rpm.zip "$ORACLE_XE_URL"
wget -q -O $HOME/.traviscache/oracle-xe-11.2.0-1.0.x86_64.rpm.zip "$ORACLE_XE_URL"
fi

2
common/pom.xml

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
</build>
<profiles>
<profile>
<id>jdk16</id>
<id>jdk6</id>
<activation>
<jdk>[1.6,1.8)</jdk>
</activation>

2
jdbcmapper/pom.xml

@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
</build>
<profiles>
<profile>
<id>jdk16</id>
<id>jdk6</id>
<activation>
<jdk>[1.6,1.8)</jdk>
</activation>

2
querymapper/pom.xml

@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
</build>
<profiles>
<profile>
<id>jdk16</id>
<id>jdk6</id>
<activation>
<jdk>[1.6,1.8)</jdk>
</activation>

2
test/pom.xml

@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
</dependencies>
</profile>
<profile>
<id>jdk16</id>
<id>jdk6</id>
<activation>
<jdk>[1.6,1.8)</jdk>
</activation>

Loading…
Cancel
Save