Merge branch 'master' into update-libbuildpack-1764784667

Author: ramonskie

VERSION

@@ -1 +1 @@
-1.10.28
+1.10.29

fixtures/default/sinatra_jruby/Procfile

@@ -0,0 +1 @@
+web: echo "Starting JRuby Sinatra app on port $PORT..." && bundle exec rackup config.ru -o 0.0.0.0 -p $PORT

fixtures/default/sinatra_jruby/manifest.yml

@@ -1,3 +1,5 @@
 ---
 applications:
 - name: sinatra_jruby_web_app
+  health-check-type: process
+  timeout: 180

go.mod

@@ -7,7 +7,7 @@ toolchain go1.24.0
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/cloudfoundry/libbuildpack v0.0.0-20251202224209-b07cc3dab65e
-	github.com/cloudfoundry/switchblade v0.9.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,15 +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/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
@@ -42,14 +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
+	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
 )
 
-replace github.com/docker/docker => github.com/docker/docker v24.0.2+incompatible
+exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd
+
+replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatible
 
 replace github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible

go.sum

@@ -61,13 +61,13 @@ dependencies:
   source: https://nodejs.org/dist/v20.16.0/node-v20.16.0.tar.gz
   source_sha256: 8f24bf9abe455a09ab30f9ae8edda1e945ed678a4b1c3b07ee0f901fdc0ff4fd
 - name: node
-  version: 22.21.0
-  uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_22.21.0_linux_x64_cflinuxfs4_fb5f1014.tgz
-  sha256: fb5f1014c8422753f6fedc55c449b8fa7d8dd00ee218b4b22eb67c0f50d06cac
+  version: 24.13.0
+  uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.13.0_linux_x64_cflinuxfs4_45a7e799.tgz
+  sha256: 45a7e7994603b3f02a6e9f7950d1780333b3dc113916a758bdc4c59ca225c13f
   cf_stacks:
   - cflinuxfs4
-  source: https://nodejs.org/dist/v22.21.0/node-v22.21.0.tar.gz
-  source_sha256: 3ada9d465cd6557b7b0ccea5f785278931a2a319bc941f68b2e742c6883f18ad
+  source: https://nodejs.org/dist/v24.13.0/node-v24.13.0.tar.gz
+  source_sha256: 54cb58921b4ce2831c6690ee823a3d39cfbf2b75f4e556c4c2bde90f3d8fd1ca
 - name: openjdk1.8-latest
   version: 1.8.0
   uri: https://java-buildpack.cloudfoundry.org/openjdk-jdk/bionic/x86_64/openjdk-jdk-1.8.0_242-bionic.tar.gz

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

@@ -25,6 +25,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
 			var err error
 			name, err = switchblade.RandomName()
 			Expect(err).NotTo(HaveOccurred())
+			println(name)
 		})
 
 		it.After(func() {
@@ -113,7 +114,9 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(logs).To(ContainLines(MatchRegexp(`Installing jruby \d+\.\d+\.\d+\.\d+`)))
-				Eventually(deployment, 1*time.Minute, 1*time.Second).Should(Serve(ContainSubstring("jruby 3.1.4")).WithEndpoint("/ruby"), logs.String())
+				// JRuby needs extra time to warm up after health check passes
+				// Increase timeout to 3 minutes with 2-second intervals for CI environments
+				Eventually(deployment, 3*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.4")).WithEndpoint("/ruby"), logs.String())
 			})
 		})
 	}