Merge "Change the parent in the pom.xml to oparent"