Fixed excludes
Fixed excludes
Separated out java 1.7 dependencies in the build.