upgraded jetty plugin
merged pom with dev