Merge branch 'master' into update-libbuildpack-1764784865

Author: ivanovac

VERSION

@@ -1 +1 @@
-1.8.41
+1.8.42

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/cloudfoundry/libbuildpack v0.0.0-20251202224209-b07cc3dab65e
-	github.com/cloudfoundry/switchblade v0.7.0
+	github.com/cloudfoundry/switchblade v0.9.4
 	github.com/golang/mock v1.6.0
 	github.com/kr/text v0.2.0
 	github.com/onsi/ginkgo v1.16.5
@@ -21,16 +21,20 @@ require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v27.4.1+incompatible // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/docker v27.5.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/elazarl/goproxy v1.2.8 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -43,15 +47,24 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
+exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd
+
 replace github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
 
-replace github.com/docker/docker => github.com/docker/docker v24.0.2+incompatible
+replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatible

go.sum

@@ -113,13 +113,13 @@ dependencies:
   source: https://www.python.org/ftp/python/3.9.24/Python-3.9.24.tgz
   source_sha256: 9a32cfc683aecaadbd9ed891ac2af9451ff37f48a00a2d8e1f4ecd9c2a1ffdcb
 - name: python
-  version: 3.9.24
-  uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.9.24_linux_x64_cflinuxfs4_0c279a45.tgz
-  sha256: 0c279a45853038d2f6865b0e46c9e3d06b6d5ac6d5ac077dfe5711121cba3136
+  version: 3.9.25
+  uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.9.25_linux_x64_cflinuxfs4_47183960.tgz
+  sha256: 47183960e453a25d6e30b763a6e868f812b58234ba747f2a380c241109b8856c
   cf_stacks:
   - cflinuxfs4
-  source: https://www.python.org/ftp/python/3.9.24/Python-3.9.24.tgz
-  source_sha256: 9a32cfc683aecaadbd9ed891ac2af9451ff37f48a00a2d8e1f4ecd9c2a1ffdcb
+  source: https://www.python.org/ftp/python/3.9.25/Python-3.9.25.tgz
+  source_sha256: a7438eabd3a48139f42d4e058096af8d880b0bb6e8fb8c78838892e4ce5583f2
 - name: python
   version: 3.10.19
   uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.10.19_linux_x64_cflinuxfs3_d754b71d.tgz
@@ -185,21 +185,21 @@ dependencies:
   source: https://www.python.org/ftp/python/3.13.9/Python-3.13.9.tgz
   source_sha256: c4c066af19c98fb7835d473bebd7e23be84f6e9874d47db9e39a68ee5d0ce35c
 - name: python
-  version: 3.14.1
-  uri: https://buildpack-dependencies.tanzu.vmware.com/cf/python/python_3.14.1_linux_x64_cflinuxfs3_003d4104.tgz
-  sha256: 003d4104979fa477be04fb32900f7d3dd492d85052c6d81394a709256b49462b
+  version: 3.14.2
+  uri: https://buildpack-dependencies.tanzu.vmware.com/cf/python/python_3.14.2_linux_x64_cflinuxfs3_82c1798d.tgz
+  sha256: 82c1798db9c1af3c4e6bd589cb1016b3c38981f809a63338f6708d6385c6e97b
   cf_stacks:
   - cflinuxfs3
-  source: https://www.python.org/ftp/python/3.14.1/Python-3.14.1.tgz
-  source_sha256: 8343f001dede23812c7e9c6064f776bade2ef5813f46f0ae4b5a4c10c9069e9a
+  source: https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tgz
+  source_sha256: c609e078adab90e2c6bacb6afafacd5eaf60cd94cf670f1e159565725fcd448d
 - name: python
-  version: 3.14.1
-  uri: https://buildpack-dependencies.tanzu.vmware.com/cf/python/python_3.14.1_linux_x64_cflinuxfs4_c486ac2d.tgz
-  sha256: c486ac2d022083d0f5e583b2d8a824d06d4aeda7bd60efdd70c234bd407ef2a6
+  version: 3.14.2
+  uri: https://buildpack-dependencies.tanzu.vmware.com/cf/python/python_3.14.2_linux_x64_cflinuxfs4_f32bebd1.tgz
+  sha256: f32bebd182dac46dc7a1a5782b4bc7e65dd67ba734d18eaf84b22487a4bede6e
   cf_stacks:
   - cflinuxfs4
-  source: https://www.python.org/ftp/python/3.14.1/Python-3.14.1.tgz
-  source_sha256: 8343f001dede23812c7e9c6064f776bade2ef5813f46f0ae4b5a4c10c9069e9a
+  source: https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tgz
+  source_sha256: c609e078adab90e2c6bacb6afafacd5eaf60cd94cf670f1e159565725fcd448d
 - name: setuptools
   version: 80.9.0
   uri: https://buildpacks.cloudfoundry.org/dependencies/setuptools/setuptools_80.9.0_linux_noarch_any-stack_db9ec7d3.tgz

manifest.yml

@@ -148,10 +148,17 @@ function util::tools::cf::install() {
       exit 1
   esac
 
+  # Check if cf already exists in the target directory or system PATH
+  if [[ -f "${dir}/cf" ]] || command -v cf >/dev/null 2>&1; then
+    util::print::title "CF CLI already installed (using system version)"
+    cf version
+    return 0
+  fi
+
   if [[ ! -f "${dir}/cf" ]]; then
     util::print::title "Installing cf"
 
-    curl "https://packages.cloudfoundry.org/stable?release=${os}-binary&version=6.49.0&source=github-rel" \
+    curl "https://packages.cloudfoundry.org/stable?release=${os}-binary&source=github-rel" \
       --silent \
       --location \
       --output /tmp/cf.tar.gz

scripts/.util/tools.sh

@@ -1,13 +1,14 @@
 package integration_test
 
 import (
-	"github.com/blang/semver"
-	"github.com/cloudfoundry/libbuildpack"
 	"os"
 	"path/filepath"
 	"regexp"
 	"testing"
 
+	"github.com/blang/semver"
+	"github.com/cloudfoundry/libbuildpack"
+
 	"github.com/cloudfoundry/switchblade"
 	"github.com/sclevine/spec"