[NO JIRA] Update AssertJ and fix build.
3 files changed