Updated ArchetypeExpression to include a query element
Updated ExtractQuery to link directly to ArchetypeExpression
Updated all pom to java 1.7