plugin management

Conflicts:

	pom.xml