[JBTM-2062] Add spi jar to the release and don't use generics diamond operator