From 31f6ea816326685e4d789eb3bc18ff1bc481aa2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 06:39:39 +0000 Subject: [PATCH] Bump github.com/paketo-buildpacks/libpak from 1.48.0 to 1.49.0 Bumps [github.com/paketo-buildpacks/libpak](https://github.com/paketo-buildpacks/libpak) from 1.48.0 to 1.49.0. - [Release notes](https://github.com/paketo-buildpacks/libpak/releases) - [Commits](https://github.com/paketo-buildpacks/libpak/compare/v1.48.0...v1.49.0) Signed-off-by: dependabot[bot] Signed-off-by: Ben Hale --- go.mod | 2 +- go.sum | 8 ++++++-- maven/build.go | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d32c6be..79b3794 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,6 @@ require ( github.com/buildpacks/libcnb v1.18.0 github.com/onsi/gomega v1.10.3 github.com/paketo-buildpacks/libbs v1.7.0 - github.com/paketo-buildpacks/libpak v1.48.0 + github.com/paketo-buildpacks/libpak v1.49.0 github.com/sclevine/spec v1.4.0 ) diff --git a/go.sum b/go.sum index 444cbae..f3695eb 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -52,10 +54,12 @@ github.com/paketo-buildpacks/libjvm v1.23.0 h1:eJPeoD0wpih19Ijfk3McgkHlzARSrqhe8 github.com/paketo-buildpacks/libjvm v1.23.0/go.mod h1:DNP6wj1LVr4SB7gL/83f9FjXxrnREY76SJGJLvzMSTw= github.com/paketo-buildpacks/libpak v1.46.0 h1:rHQDV3hAMNfJRPPNUe5EhKqtK3TlJJ72WlN9qJuw1/k= github.com/paketo-buildpacks/libpak v1.46.0/go.mod h1:SEcsqgVo5Ly3YcBQOaJBkbIiXYYjoOastlGL6ozo97g= -github.com/paketo-buildpacks/libpak v1.48.0 h1:8p+hyjZbbWExag6WxyCnNJrEOmjvbK6LBzzRxa6HKpA= -github.com/paketo-buildpacks/libpak v1.48.0/go.mod h1:gx1On0u2+Ihyy4sw3nwnawsb+Mkby1FBB/7DQReXdxs= +github.com/paketo-buildpacks/libpak v1.49.0 h1:Yf3wt1RBb5Psjmc1X7joMal/tL15kSl8lz07Rfh48m4= +github.com/paketo-buildpacks/libpak v1.49.0/go.mod h1:8vMe0mZNZj1vqngvtH6KCrs98mL+KW9mTymOb5PE6pw= github.com/pavel-v-chernykh/keystore-go v2.1.0+incompatible h1:Jd6xfriVlJ6hWPvYOE0Ni0QWcNTLRehfGPFxr3eSL80= github.com/pavel-v-chernykh/keystore-go v2.1.0+incompatible/go.mod h1:xlUlxe/2ItGlQyMTstqeDv9r3U4obH7xYd26TbDQutY= +github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= +github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= diff --git a/maven/build.go b/maven/build.go index b53bf90..cad73e4 100644 --- a/maven/build.go +++ b/maven/build.go @@ -29,6 +29,7 @@ import ( "github.com/paketo-buildpacks/libbs" "github.com/paketo-buildpacks/libpak" "github.com/paketo-buildpacks/libpak/bard" + "github.com/paketo-buildpacks/libpak/bindings" ) type Build struct { @@ -94,9 +95,9 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) { if err != nil { return libcnb.BuildResult{}, fmt.Errorf("unable to resolve build arguments\n%w", err) } + md := map[string]interface{}{} - br := libpak.BindingResolver{Bindings: context.Platform.Bindings} - if binding, ok, err := br.Resolve("maven"); err != nil { + if binding, ok, err := bindings.ResolveOne(context.Platform.Bindings, bindings.OfType("maven")); err != nil { return libcnb.BuildResult{}, fmt.Errorf("unable to resolve binding\n%w", err) } else if ok { args, err = handleMavenSettings(binding, args, md)