Skip to content

Commit

Permalink
Upgrade dependencies versions and DB test versions
Browse files Browse the repository at this point in the history
Update documentation with needed docker command
  • Loading branch information
jerolba committed Dec 8, 2020
1 parent ffe8c92 commit 8a6b3ff
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- MYSQL_USER=test
- MYSQL_PASSWORD=test
- MYSQL_DATABASE=testdb
- image: circleci/postgres:10.9
- image: circleci/postgres:12.5
environment:
- POSTGRES_USER=test
- POSTGRES_PASSWORD=test
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
- ~/.m2
key: v1-dependencies-{{ checksum "build.gradle" }}

- run: ./gradlew test
- run: ./gradlew test --console=plain

# Jacoco and codecov
- run: ./gradlew jacocoTestReport
Expand All @@ -54,7 +54,7 @@ jobs:
- MYSQL_DATABASE=testdb
#In MySql 8 local-infile is not active by default
command: mysqld --local-infile=1
- image: circleci/postgres:11.5
- image: circleci/postgres:13.1
environment:
- POSTGRES_USER=test
- POSTGRES_PASSWORD=test
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- ~/.m2
key: v1-dependencies-{{ checksum "build.gradle" }}

- run: ./gradlew test -Pmysql8
- run: ./gradlew test -Pmysql8 --console=plain

workflows:
version: 2.0
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ JFleet has not been tested against all JDBC driver versions, but it is expected

## Supported database versions

JFleet is configured to execute continuous integration tests against [CircleCI](https://circleci.com/gh/jerolba/jfleet) service, using the latest stable release of **MySQL 5.7** and **MySQL 8.0**, and the latest stable release of **PostgreSQL 10.9** and **PostgreSQL 11.5**.
JFleet is configured to execute continuous integration tests against [CircleCI](https://circleci.com/gh/jerolba/jfleet) service, using the latest stable release of **MySQL 5.7** and **MySQL 8.0**, and the latest stable release of **PostgreSQL 12.5** and **PostgreSQL 13.1**.

**JFleet is currently running in production against AWS Aurora MySQL edition**, and has been tested for [benchmarks](https://github.com/jerolba/jfleet-benchmark#jfleet-benchmark) with the Google Cloud managed versions of MySQL and Postgres.
**JFleet is currently running in production against AWS Aurora MySQL and Aurora PostgreSQL**, and has been tested for [benchmarks](https://github.com/jerolba/jfleet-benchmark#jfleet-benchmark) with the Google Cloud managed versions of MySQL and Postgres.

Any database engine with a standard JDBC driver should be used with the `JdbcBulkInsert` implementation.

Expand All @@ -216,6 +216,14 @@ Tests need a MySQL and a PostgreSQL instances running in localhost. A database c

You can modify this settings changing locally [mysql-test.properties](https://github.com/jerolba/jfleet/blob/master/jfleet-core/src/test/resources/mysql-test.properties) and [postgres-test.properties](https://github.com/jerolba/jfleet/blob/master/jfleet-core/src/test/resources/postgres-test.properties) files.

If you have docker installed, you can launch them using the following commands:

```bash
docker run --name mysql-jfleet -e MYSQL_ROOT_PASSWORD=jfleet -e MYSQL_USER=test -e MYSQL_PASSWORD=test -e MYSQL_DATABASE=testdb -p 3306:3306 -d mysql:5.7

docker run --name postgres-jfleet -e POSTGRES_USER=test -e POSTGRES_PASSWORD=test -e POSTGRES_DB=testdb -p 5432:5432 -d postgres:12.5
```

To execute all test you must execute the command:

```bash
Expand Down
26 changes: 9 additions & 17 deletions jfleet-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,34 @@ compileJava {
}

dependencies {
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
compileOnly group: 'javax.persistence', name: 'persistence-api', version: '1.0.2'
if (project.hasProperty("mysql8")) {
compileOnly project(':jfleet-mock-mysql5')
compileOnly group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
compileOnly group: 'mysql', name: 'mysql-connector-java', version: '8.0.22'
} else {
compileOnly group: 'mysql', name: 'mysql-connector-java', version: '5.1.43'
compileOnly group: 'mysql', name: 'mysql-connector-java', version: '5.1.49'
compileOnly project(':jfleet-mock-mysql8')
}
compileOnly group: 'org.postgresql', name: 'postgresql', version: '42.2.7'

testCompile group: 'javax.persistence', name: 'persistence-api', version: '1.0.2'
if (project.hasProperty("mysql8")) {
testCompile project(':jfleet-mock-mysql5')
testCompile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
testCompile group: 'mysql', name: 'mysql-connector-java', version: '8.0.22'
} else {
testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.43'
testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.49'
testCompile project(':jfleet-mock-mysql8')
}
testCompile group: 'org.postgresql', name: 'postgresql', version: '42.2.7'
testCompile group: 'org.postgresql', name: 'postgresql', version: '42.2.18'
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.2'
testRuntime group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.2'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.7.0'
testRuntime group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0'
}

test {
useJUnitPlatform()
testLogging {
showStandardStreams true
showExceptions true
showStackTraces true
showCauses true
exceptionFormat "full"
events "passed", "skipped", "failed", "standardOut", "standardError"
}
}

jacocoTestReport {
Expand Down

0 comments on commit 8a6b3ff

Please sign in to comment.