Commit Graph

4 Commits

Author SHA1 Message Date
Phillip Webb ff36074401 Update copyright header for changed files
Effectively all files have been touched this year due to the nohttp
work.
2019-07-24 11:37:23 +01:00
Andy Wilkinson 4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson a9811e360a Add missing copyright headers to .java source files 2018-01-05 12:04:34 +00:00
Madhura Bhave 16fe332f51 Fix NoClassDefFoundError when Mockito is missing
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.

Fixes gh-7065
2016-10-03 22:27:20 -07:00