fixing classpath build logic. All artifacts should be added to classpath...

The branch code has the same issue with the 'provided' scope artifacts. I have a smaller fix, you can ignore the other push into the master repo.