From 2795b775841c185479746713f4e8cdbbf8fbb699 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Tue, 20 Oct 2020 21:51:50 -0400 Subject: [PATCH] Bump junit from 4.11 to 4.13.1 --- .travis.yml | 7 +++++-- pom.xml | 2 +- readme.md | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa3886e..eefb895 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_script: script: - mvn -v # java8+ supports everything - - ./test/runSnapshotTests.sh --offline || travis_terminate 1; + - ./test/runSnapshotTests.sh || travis_terminate 1; # everything against BIND - mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=BIND -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' '-DjdbcUrl4=jdbc:sqlserver://localhost:1433;databaseName=master;username=sa;password=;' || travis_terminate 1; # everything against BIND jdbcMapper, but OPTIMAL queryMapper @@ -55,6 +55,9 @@ matrix: script: # java6 doesn't support ms-sql at all, and doesn't support h2 with ANY - mvn -v + # java6 can't connect to https on maven central, use java7 to predownload everything, then clean up + - JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 mvn clean verify || travis_terminate 1; + - mvn --offline clean || travis_terminate 1; - ./test/runSnapshotTests.sh --offline || travis_terminate 1; - mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=BIND -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 -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; @@ -66,7 +69,7 @@ matrix: script: # java7 doesn't support h2 with ANY - mvn -v - - ./test/runSnapshotTests.sh --offline || travis_terminate 1; + - ./test/runSnapshotTests.sh || travis_terminate 1; - mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=BIND -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' '-DjdbcUrl4=jdbc:sqlserver://localhost:1433;databaseName=master;username=sa;password=;' || travis_terminate 1; - mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=BIND -DqueryMapper.databaseType=OPTIMAL -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' '-DjdbcUrl4=jdbc:sqlserver://localhost:1433;databaseName=master;username=sa;password=;' || travis_terminate 1; - mvn --offline -B -pl test clean test -DjdbcMapper.databaseType=ANY '-DjdbcUrl=jdbc:postgresql:test_db' || travis_terminate 1; diff --git a/pom.xml b/pom.xml index 16128d7..5ca82ff 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ junit junit - 4.11 + 4.13.1 test diff --git a/readme.md b/readme.md index 2a27905..c2bafc0 100644 --- a/readme.md +++ b/readme.md @@ -35,7 +35,7 @@ Builds/tests [![Travis-CI Build Status](https://api.travis-ci.org/moparisthebest/JdbcMapper.svg?branch=master)](https://travis-ci.org/moparisthebest/JdbcMapper) -JdbcMapper is currently built and tested using travis-ci on every version of Java 6 to 15, and against all +JdbcMapper is currently built and tested using travis-ci on every version of Java 6 to 16, and against all databases/drivers that could be found, currently [MariaDB](https://mariadb.org) ([MySQL](https://www.mysql.com/)), [PostgreSQL](https://www.postgresql.org/), [Oracle](https://www.oracle.com/database/technologies/appdev/xe.html), [MS-SQL](https://www.microsoft.com/en-us/sql-server), [SQLite](https://sqlite.org), [H2](https://www.h2database.com/),