Found that the GradleCdiUtil worked.  Now more cdi validation errors in my Web app.  Removed the classes that looked to be unnecessary.  Still work to do to remove the hard-coding of the "convention" locations.