3.6.0 release (previous 3.5.15) + release notes updated by CI build 4836

[ci skip-release]
mockito · Oct 27, 2020 · caac353 · caac353
1 parent b5bea2b
commit caac353
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.6.0
+ - 2020-10-27 - [7 commits](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.0) by [Szczepan Faber](https://github.com/mockitoguy) (4), [shipkit-org](https://github.com/shipkit-org) (2), [Tim van der Lippe](https://github.com/TimvdLippe) (1) - published to [![Bintray](https://img.shields.io/badge/Bintray-3.6.0-green.svg)](https://bintray.com/mockito/maven/mockito/3.6.0)
+ - Retry the release [(#2078)](https://github.com/mockito/mockito/pull/2078)
+ - Retry 3.6.0 release [(#2077)](https://github.com/mockito/mockito/pull/2077)
+
 #### 3.5.15
  - 2020-10-19 - [4 commits](https://github.com/mockito/mockito/compare/v3.5.14...v3.5.15) by [Rafael Winterhalter](https://github.com/raphw) - published to [![Bintray](https://img.shields.io/badge/Bintray-3.5.15-green.svg)](https://bintray.com/mockito/maven/mockito/3.5.15)
  - Mock resolver plugin [(#2042)](https://github.com/mockito/mockito/pull/2042)

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