3.1.4 release (previous 3.1.3) + release notes updated by CI build 4258

[ci skip-release]
mockito · Oct 31, 2019 · ec99f17 · ec99f17
1 parent b2b66f4
commit ec99f17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/doc/release-notes/official.md b/doc/release-notes/official.md
@@ -1,5 +1,10 @@
 <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
 
+#### 3.1.4
+ - 2019-10-31 - [4 commits](https://github.com/mockito/mockito/compare/v3.1.3...v3.1.4) by [Szczepan Faber](https://github.com/mockitoguy) - published to [![Bintray](https://img.shields.io/badge/Bintray-3.1.4-green.svg)](https://bintray.com/mockito/maven/mockito-development/3.1.4)
+ - Fixed JUnit5 concurrency bug [(#1806)](https://github.com/mockito/mockito/pull/1806)
+ - Added Tidelift info to README.md [(#1805)](https://github.com/mockito/mockito/pull/1805)
+
 #### 3.1.3
  - 2019-10-29 - [7 commits](https://github.com/mockito/mockito/compare/v3.1.2...v3.1.3) by 5 authors - published to [![Bintray](https://img.shields.io/badge/Bintray-3.1.3-green.svg)](https://bintray.com/mockito/maven/mockito-development/3.1.3)
  - Commits: [Tim van der Lippe](https://github.com/TimvdLippe) (2), [Tokuhiro Matsuno](https://github.com/tokuhirom) (2), [Federico Fissore](https://github.com/ffissore) (1), [Max Zhu](https://github.com/maxcellent) (1), [Szczepan Faber](https://github.com/mockitoguy) (1)

diff --git a/version.properties b/version.properties
@@ -1,5 +1,5 @@
 #Currently building Mockito version
-version=3.1.4
+version=3.1.5
 
 #Previous version used to generate release notes delta
-previousVersion=3.1.3
+previousVersion=3.1.4