Refactored pom.xml

Change-Id: I055e5bd78c325a3de489b9e3236f4b10d6179978