resolve merge conflict from main

liquibase · Jul 2, 2020 · 7092d0c · 7092d0c
2 parents 6dc5f3b + 135ef4e
commit 7092d0c
Show file tree

Hide file tree

Showing 8 changed files with 269 additions and 86 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,10 @@ target/
 *.ipr
 
 ##other###
-*.log
+*.log
+
+# VS Code Java
+*.prefs
+.project
+.classpath
+.factorypath
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,13 @@
 language: java
+jdk: openjdk8
 
 os: linux
 
 services:
   - docker
 
 before_script:
-  - docker run -d -p 27017-27019:27017-27019 --name mongodb mongo:4.0.3
+  - docker run -d -p 27017-27019:27017-27019 --name mongodb mongo
+
+script:
+  - mvn clean install -Prun-its
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Liquibase MongoDB Extension
 
+[![Build Status](https://travis-ci.com/liquibase/liquibase-mongodb.svg?branch=master)](https://travis-ci.com/liquibase/liquibase-mongodb)
+
 ## Table of contents
 
 1. [Introduction](#introduction)
@@ -46,11 +48,7 @@ These instructions will get you a copy of the project up and running on your loc
 
 ### Prerequisites
 
-####Tested on: 
-
 ```
-MongoDB 4.0.3
-liquibase-core:3.6.3
 mongo-java-driver:3.10.2
 ```