updated junit libraris to junit4
merge pom
resource add in conf object rather than global