From 05b39bfc5e4558f4c1c6853d5b454f534bdfefe0 Mon Sep 17 00:00:00 2001 From: shipkit-org Date: Fri, 10 Jul 2020 19:38:11 +0000 Subject: [PATCH] 3.4.0 release (previous 3.3.12) + release notes updated by CI build 4577 [ci skip-release] --- doc/release-notes/official.md | 25 +++++++++++++++++++++++++ version.properties | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/official.md b/doc/release-notes/official.md index 10ffc95186..681af51011 100644 --- a/doc/release-notes/official.md +++ b/doc/release-notes/official.md @@ -1,5 +1,30 @@ *Release notes were automatically generated by [Shipkit](http://shipkit.org/)* +#### 3.4.0 + - 2020-07-10 - [19 commits](https://github.com/mockito/mockito/compare/v3.3.12...v3.4.0) by 9 authors - published to [![Bintray](https://img.shields.io/badge/Bintray-3.4.0-green.svg)](https://bintray.com/mockito/maven/mockito/3.4.0) + - Commits: [Tim van der Lippe](https://github.com/TimvdLippe) (5), [Erhard Pointl](https://github.com/epeee) (4), [Rafael Winterhalter](https://github.com/raphw) (3), [Eitan Adler](https://github.com/grimreaper) (2), adrianriley (1), akluball (1), [Artem Prigoda](https://github.com/arteam) (1), [Jamie Tanna](https://github.com/jamietanna) (1), [Naoki Takezoe](https://github.com/takezoe) (1) + - [Android support] Enable mocking static methods in Mockito [(#1013)](https://github.com/mockito/mockito/issues/1013) + - Document using `@Mock` with method parameters [(#1961)](https://github.com/mockito/mockito/pull/1961) + - Documentation: `@Mock` on method parameters [(#1960)](https://github.com/mockito/mockito/issues/1960) + - Update errorprone gradle plugin to v1.2.1 [(#1958)](https://github.com/mockito/mockito/pull/1958) + - Update spotless Travis job name to be more descriptive [(#1957)](https://github.com/mockito/mockito/pull/1957) + - Fix a confusing typo in subclassing error message [(#1953)](https://github.com/mockito/mockito/pull/1953) + - Update bnd gradle plugin to v5.1.1 [(#1952)](https://github.com/mockito/mockito/pull/1952) + - Use errorprone 2.4.0 [(#1951)](https://github.com/mockito/mockito/pull/1951) + - Use jacoco v0.8.5 [(#1950)](https://github.com/mockito/mockito/pull/1950) + - Fixes #1712 : prepend description to AssertionError thrown in verification [(#1949)](https://github.com/mockito/mockito/pull/1949) + - Update gradle 6 [(#1948)](https://github.com/mockito/mockito/pull/1948) + - Move spotless check to separate build task [(#1946)](https://github.com/mockito/mockito/pull/1946) + - [Travis] Replace JDK 9/10 with 14 [(#1945)](https://github.com/mockito/mockito/pull/1945) + - Fixes #1898 : Return mock name from toString method for deep stub mocks [(#1942)](https://github.com/mockito/mockito/pull/1942) + - [checkstyle] switch to new DTD [(#1940)](https://github.com/mockito/mockito/pull/1940) + - Use google-java-format in spotless [(#1934)](https://github.com/mockito/mockito/pull/1934) + - Update report message to use any() instead of anyObject() [(#1931)](https://github.com/mockito/mockito/pull/1931) + - [build] bump gradle to latest 5.x release [(#1923)](https://github.com/mockito/mockito/pull/1923) + - [build] update gradle-errorprone-plugin to 1.1.0 [(#1908)](https://github.com/mockito/mockito/pull/1908) + - RETURNS_DEEP_STUBS override a mock's toString to `null` [(#1898)](https://github.com/mockito/mockito/issues/1898) + - "description" not printing when verify args don't match [(#1712)](https://github.com/mockito/mockito/issues/1712) + #### 3.3.12 - 2020-05-25 - [1 commit](https://github.com/mockito/mockito/compare/v3.3.11...v3.3.12) by [Vinicius Scheidegger](https://github.com/vinischeidegger) - published to [![Bintray](https://img.shields.io/badge/Bintray-3.3.12-green.svg)](https://bintray.com/mockito/maven/mockito-development/3.3.12) - Update javadoc - remove deprecated class [(#1938)](https://github.com/mockito/mockito/pull/1938) diff --git a/version.properties b/version.properties index 08cb82acfe..7b175e1bbc 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ #Currently building Mockito version -version=3.4.0 +version=3.4.1 #Previous version used to generate release notes delta -previousVersion=3.3.12 +previousVersion=3.4.0