Update to use Maven Annotations

Not real clear here on what isn't necessary now.  Method is called throughout code.  Do you mean the cast to artifact?  I think that is what you mean but not completely sure.