Provide a variant of the junit.core Service annotation that uses generics

That rule can be made easier to use with generics, but we need to keep it for backwards compatibility. I'll create a variant that uses generics.