Moved aspectj to the tree
Moved mockito to the tree