Merge pull request #5 from apache/rotty3000/cdi-spi

Rotty3000/cdi spi