add org.apache.aries.jmx.core to site/pom.xml (per @pleacu) and remove accidentally committed conflict code >> master