Modified some dependency scopes to make war smaller

Details
-------

Ticket
------