Fixed maven archetype with new java dsl test and xml test annotations