Fixes: gh-6161
Issue gh-4802
The build now uses spring build conventions to simplify the build Fixes gh-4284