v2.5
Merge tag 'v2.5' of https://github.com/cloudfoundry/java-buildpack