Merge branch 'develop' into master

CHANGELOG

@@ -1,3 +1,16 @@
+v1.2.22 Jan 08, 2025
+=====================
+
+* Bump go deps
+
+
+v1.2.21 Dec 12, 2024
+=====================
+
+* Add nginx 1.27.3, remove nginx 1.27.2
+  for stack(s) cflinuxfs3, cflinuxfs4
+
+
 v1.2.20 Nov 07, 2024
 =====================
 

VERSION

@@ -1 +1 @@
-1.2.20
+1.2.22

go.mod

@@ -4,11 +4,11 @@ go 1.22.5
 
 require (
 	github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
-	github.com/cloudfoundry/libbuildpack v0.0.0-20240716203800-e8e9729b7ef9
+	github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba
 	github.com/golang/mock v1.6.0
-	github.com/miekg/dns v1.1.57
+	github.com/miekg/dns v1.1.62
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.30.0
+	github.com/onsi/gomega v1.36.2
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -17,21 +17,21 @@ require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5 // indirect
-	github.com/elazarl/goproxy/ext v0.0.0-20210110162100-a92cc753f88e // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/elazarl/goproxy v1.2.8 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/paketo-buildpacks/packit v1.3.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/tidwall/gjson v1.17.0 // indirect
+	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.16.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sync v0.10.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
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

manifest.yml

@@ -25,21 +25,21 @@ dependencies:
   source: http://nginx.org/download/nginx-1.26.2.tar.gz
   source_sha256: 627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738
 - name: nginx
-  version: 1.27.2
-  uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.27.2_linux_x64_cflinuxfs3_a86f63ca.tgz
-  sha256: a86f63ca0fe46f5c9d1da52f8b32afd3104b0a2d504fd58710aa78824fe5478c
+  version: 1.27.3
+  uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.27.3_linux_x64_cflinuxfs3_75409e6d.tgz
+  sha256: 75409e6d464539dec470d61984150e0dea89e1a70ced14d07c5fa7f06eacd7f1
   cf_stacks:
   - cflinuxfs3
-  source: http://nginx.org/download/nginx-1.27.2.tar.gz
-  source_sha256: a91ecfc3a0b3a2c1413afca627bd886d76e0414b81cad0fb7872a9655a1b25fa
+  source: http://nginx.org/download/nginx-1.27.3.tar.gz
+  source_sha256: ba23a9568f442036b61cd0e29bd66a47b90634efa91e0b2cf2d719057a9b7903
 - name: nginx
-  version: 1.27.2
-  uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.27.2_linux_x64_cflinuxfs4_25323d95.tgz
-  sha256: 25323d953354f73bdd07ff376ee43d4f78fe92fca89d03e4c3d3216882a8d27b
+  version: 1.27.3
+  uri: https://buildpacks.cloudfoundry.org/dependencies/nginx/nginx_1.27.3_linux_x64_cflinuxfs4_b5d263d8.tgz
+  sha256: b5d263d84a90fab2993bfe366d34852ec31d3c1b0e4eeef1323dbd71150bbe9d
   cf_stacks:
   - cflinuxfs4
-  source: http://nginx.org/download/nginx-1.27.2.tar.gz
-  source_sha256: a91ecfc3a0b3a2c1413afca627bd886d76e0414b81cad0fb7872a9655a1b25fa
+  source: http://nginx.org/download/nginx-1.27.3.tar.gz
+  source_sha256: ba23a9568f442036b61cd0e29bd66a47b90634efa91e0b2cf2d719057a9b7903
 - name: openresty
   version: 1.21.4.3
   uri: https://buildpacks.cloudfoundry.org/dependencies/openresty/openresty_1.21.4.3_linux_x64_cflinuxfs3_aa3d0f78.tgz

src/nginx/brats/brats_test.go

@@ -9,9 +9,7 @@ import (
 
 var _ = Describe("Nginx buildpack", func() {
 	bratshelper.UnbuiltBuildpack("nginx", CopyBrats)
-	bratshelper.DeployingAnAppWithAnUpdatedVersionOfTheSameBuildpack(CopyBrats)
 	bratshelper.DeployAppWithExecutableProfileScript("nginx", CopyBrats)
-	bratshelper.DeployAnAppWithSensitiveEnvironmentVariables(CopyBrats)
 	bratshelper.ForAllSupportedVersions("nginx", CopyBrats, func(nginxVersion string, app *cutlass.App) {
 		bratshelper.PushApp(app)