Sakai.Git

* SAK-34190 allow deleting a published assessment with submissions as we now have restoration capabilities

* Removed hard deletion of rubric evaluations when soft deleting associations

Co-authored-by: Adrian Fish <adrian.r.fish@gmail.com>

(cherry picked from commit fc87db778d2a79893b55be4e78370430f68a519f)

(cherry picked from commit a308de19b2ba89e0707ea14acf489e7f24e97a39)

(cherry picked from commit a308de19b2ba89e0707ea14acf489e7f24e97a39)

* SAK-43551 Deprecated: import org.mockito.runners.MockitoJUnitRunner;

=>

import org.mockito.junit.MockitoJUnitRunner;

* SAK-43551 Update Mockito 3.3.0

(cherry picked from commit f00aaa3a171dd3edf5e87573b5bfcce6547527b0)

Conflicts:

sitestats/pom.xml

This reverts commit 205218ad107edafaa37a5a62591555f6c162736a.

(cherry picked from commit ef6525bd2a22723b8d0b8ad9d0665c247af63f6c)

(cherry picked from commit e23b663d707f4f0c414cf25e50f8fee186665027)

(cherry picked from commit e23b663d707f4f0c414cf25e50f8fee186665027)

Conflicts:

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/DeleteItemPanel.html

(cherry picked from commit 6687aabd66360046020dc7b5fd10f0cfc17826a5)