[JBTM-2062] Add spi jar to the release and don't use generics diamond operator
[JBTM-2066] Diamond operator not supported by code coverage job