update pom

Conflicts:
	pom.xml
update deps