PIVOT-397 - Removed the exclusion of java sources from resources folders (but keep commented), and little changes in BUILD file