liferay 6.0 support and server dependency refactor